Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
97f617b5
Commit
97f617b5
authored
Nov 06, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs/theora: fixed compilation on OS X and removed outdated patches
parent
2aa61dc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
59 deletions
+3
-59
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+3
-9
extras/contrib/src/Patches/theora_mac_intel32.patch
extras/contrib/src/Patches/theora_mac_intel32.patch
+0
-25
extras/contrib/src/Patches/theora_mac_ppc.patch
extras/contrib/src/Patches/theora_mac_ppc.patch
+0
-25
No files found.
extras/contrib/src/Makefile
View file @
97f617b5
...
@@ -755,13 +755,6 @@ libtheora-$(THEORA_VERSION).tar.bz2:
...
@@ -755,13 +755,6 @@ libtheora-$(THEORA_VERSION).tar.bz2:
libtheora
:
libtheora-$(THEORA_VERSION).tar.bz2
libtheora
:
libtheora-$(THEORA_VERSION).tar.bz2
$(EXTRACT_BZ2)
$(EXTRACT_BZ2)
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS_ON_INTEL
patch
-p0
< Patches/theora_mac_intel32.patch
else
patch
-p0
< Patches/theora_mac_ppc.patch
endif
endif
patch
-p0
< Patches/libtheora-includes.patch
patch
-p0
< Patches/libtheora-includes.patch
THEORACONF
=
--disable-sdltest
--disable-oggtest
--disable-vorbistest
--disable-examples
THEORACONF
=
--disable-sdltest
--disable-oggtest
--disable-vorbistest
--disable-examples
...
@@ -775,8 +768,8 @@ endif
...
@@ -775,8 +768,8 @@ endif
.theora
:
libtheora .ogg
.theora
:
libtheora .ogg
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
cd
$<
;
$(HOSTCC)
./autogen.sh
$(HOSTCONF)
--prefix
=
$(PREFIX)
$(THEORACONF
)
cd
$<
;
(
$(HOSTCC)
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
$(THEORACONF)
&&
make
&&
make
install
)
e
ndif
e
lse
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
cd
$<
;
$(HOSTCC)
./autogen.sh
$(HOSTCONF)
--prefix
=
$(PREFIX)
$(THEORACONF)
cd
$<
;
$(HOSTCC)
./autogen.sh
$(HOSTCONF)
--prefix
=
$(PREFIX)
$(THEORACONF)
endif
endif
...
@@ -786,6 +779,7 @@ endif
...
@@ -786,6 +779,7 @@ endif
--prefix
=
$(PREFIX)
$(THEORACONF)
;
\
--prefix
=
$(PREFIX)
$(THEORACONF)
;
\
fi
fi
cd
$<
&&
make
&&
make
install
cd
$<
&&
make
&&
make
install
endif
$(INSTALL_NAME)
$(INSTALL_NAME)
touch
$@
touch
$@
...
...
extras/contrib/src/Patches/theora_mac_intel32.patch
deleted
100644 → 0
View file @
2aa61dc5
--- libtheora/configure.ac 2007-09-18 08:47:09.000000000 +0200
+++ libtheora.new/configure.ac 2007-09-23 14:44:48.000000000 +0200
@@ -93,7 +93,7 @@
case $host in
*)
DEBUG="-g -DDEBUG"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p -DDEBUG" ;;
esac
else
@@ -101,11 +101,11 @@
case $host in
*)
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ EXTRAS_CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops -read_only_relocs suppress -fno-pic"
PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRAS_CFLAGS $cflags_save"
cpu_x86_64=no
cpu_x86_32=no
extras/contrib/src/Patches/theora_mac_ppc.patch
deleted
100644 → 0
View file @
2aa61dc5
--- libtheora/configure.ac 2007-09-18 08:47:09.000000000 +0200
+++ libtheora.new/configure.ac 2007-09-23 14:44:48.000000000 +0200
@@ -93,7 +93,7 @@
case $host in
*)
DEBUG="-g -DDEBUG"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p -DDEBUG" ;;
esac
else
@@ -101,11 +101,11 @@
case $host in
*)
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ EXTRAS_CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops -read_only_relocs suppress"
PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRAS_CFLAGS $cflags_save"
cpu_x86_64=no
cpu_x86_32=no
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