Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
d92fc212
Commit
d92fc212
authored
Feb 17, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch unneeded since it was merged upstream.
parent
d7abef44
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
40 deletions
+0
-40
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
extras/contrib/src/Patches/flac-mactel.patch
extras/contrib/src/Patches/flac-mactel.patch
+0
-37
No files found.
extras/contrib/src/Makefile
View file @
d92fc212
...
@@ -701,9 +701,6 @@ flac-$(FLAC_VERSION).tar.gz:
...
@@ -701,9 +701,6 @@ flac-$(FLAC_VERSION).tar.gz:
flac
:
flac-$(FLAC_VERSION).tar.gz
flac
:
flac-$(FLAC_VERSION).tar.gz
$(EXTRACT_GZ)
$(EXTRACT_GZ)
ifdef
HAVE_DARWIN_OS
patch
-p0
< Patches/flac-mactel.patch
endif
ifneq
($(HOST),$(BUILD))
ifneq
($(HOST),$(BUILD))
(
patch
-p0
< Patches/flac-cross.patch
&&
cd
$@
&&
autoconf
)
(
patch
-p0
< Patches/flac-cross.patch
&&
cd
$@
&&
autoconf
)
endif
endif
...
...
extras/contrib/src/Patches/flac-mactel.patch
deleted
100644 → 0
View file @
d7abef44
diff -puriN flac/configure flac-patched/configure
--- flac/configure 2006-01-26 22:42:40.000000000 +0100
+++ flac-patched/configure 2006-01-26 22:36:50.000000000 +0100
@@ -8702,6 +8702,7 @@
fi
case "$host" in
i386-*-openbsd3.[0-3]) OBJ_FORMAT=aoutb ;;
+ i*86-apple-darwin*) OBJ_FORMAT=macho ;;
*) OBJ_FORMAT=elf ;;
esac
diff -puriN flac/configure.in flac-patched/configure.in
--- flac/configure.in 2006-01-26 22:42:36.000000000 +0100
+++ flac-patched/configure.in 2006-01-26 22:36:50.000000000 +0100
@@ -52,6 +52,7 @@
AM_CONDITIONAL(FLaC__CPU_PPC, test x$cpu
AM_CONDITIONAL(FLaC__CPU_SPARC, test x$cpu_sparc = xtrue)
case "$host" in
i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;;
+ i*86-apple-darwin*) OBJ_FORMAT=macho ;;
*) OBJ_FORMAT=elf ;;
esac
AC_SUBST(OBJ_FORMAT)
diff -puriN flac/src/libFLAC/ia32/nasm.h flac-patched/src/libFLAC/ia32/nasm.h
--- flac/src/libFLAC/ia32/nasm.h 2005-01-25 05:14:22.000000000 +0100
+++ flac-patched/src/libFLAC/ia32/nasm.h 2006-01-26 22:38:54.000000000 +0100
@@ -45,6 +45,11 @@
%idefine code_section section .text
%idefine data_section section .data
%idefine bss_section section .bss
+%elifdef OBJ_FORMAT_macho
+ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
+ %idefine code_section section .text
+ %idefine data_section section .data
+ %idefine bss_section section .bss
%elifdef OBJ_FORMAT_elf
%idefine code_section section .text align=16
%idefine data_section section .data align=32
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment