diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | contrib/Jamfile | 69 | ||||
| -rw-r--r-- | libhb/Makefile | 2 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 12 | ||||
| -rw-r--r-- | test/Makefile | 4 |
5 files changed, 4 insertions, 91 deletions
@@ -12,9 +12,6 @@ dev: clean internal app: (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB ) -internal: - (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration Development OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) DEV ) ; rm -rf plugins ; mkdir plugins ; cp contrib/lib/libquicktime/* plugins - clean: (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ) @@ -27,11 +24,6 @@ ifeq ($(SNAP), 1) ( mv Handbrake.dmg Handbrake-$(HB_VERSION)-MacOS_UB.dmg ) endif -releaseint: - (rm -rf Handbrake Handbrake.dmg ; mkdir -p Handbrake/api Handbrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS Handbrake/doc ; cp -rp HandBrake.app Handbrake ; cp -rp libhb/libhb.dylib Handbrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h Handbrake/api ; cp -rp HandbrakeCLI Handbrake ; cd HandBrake ; mkdir plugins ; cd plugins ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_audiocodec.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_faac.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_ffmpeg.so; ln ../HandBrake.app/Contents/Resources/plugins/lqt_lame.so; ln ../HandBrake.app/Contents/Resources/plugins/lqt_rtjpeg.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_videocodec.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_x264.so; cd ../.. ; hdiutil create -srcfolder Handbrake -format UDZO Handbrake.dmg ; rm -rf Handbrake ) - -endif - ifeq ($(SYSTEM),Linux) all: contrib/.contrib libhb/libhb.a HandBrakeCLI diff --git a/contrib/Jamfile b/contrib/Jamfile index 331bd3032..5e476d334 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -364,77 +364,10 @@ actions Zlib cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf zlib && tar xzf zlib.tar.gz && cd zlib && - ./configure --prefix=$CONTRIB && make && make install && + ./configure --prefix=$CONTRIB && make && make install && touch $CONTRIB/.contrib strip -S $CONTRIB/lib/libz.a } Wget $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ; Zlib $(SUBDIR)/lib/libz.a : $(SUBDIR)/zlib.tar.gz ; } -#libquicktime don't build on Cygwin! Do we really need it? -if $(OS) != CYGWIN -{ - # libquicktime - rule LibQT - { - - if $(OS) = MACOSX - { - POST_LibQT = "cd plugins/faac && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -o .libs/lqt_faac.so -bundle .libs/faac.o .libs/lqt_faac.o $CONTRIB/lib/libfaac.a ../../src/.libs/libquicktime.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_faac.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../audiocodec && gcc -flat_namespace -undefined suppress -o .libs/lqt_audiocodec.so -bundle .libs/ima4.o .libs/pcm.o .libs/lqt_audiocodec.o ../../src/.libs/libquicktime.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_audiocodec.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../rtjpeg && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -o .libs/lqt_rtjpeg.so -bundle .libs/rtjpeg_codec.o .libs/lqt_rtjpeg.o .libs/RTjpeg.o ../../src/.libs/libquicktime.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_rtjpeg.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../videocodec && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -o .libs/lqt_videocodec.so -bundle .libs/raw.o .libs/v210.o .libs/v308.o .libs/v408.o .libs/v410.o .libs/yuv2.o .libs/yuv4.o .libs/yv12.o .libs/lqt_videocodec.o ../../src/.libs/libquicktime.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_videocodec.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../lame && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -o .libs/lqt_lame.so -bundle .libs/lame_codec.o .libs/lqt_lame.o ../../src/.libs/libquicktime.a -all_load $CONTRIB/lib/libmp3lame.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_lame.so $CONTRIB/lib/libquicktime && cd ../x264 && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -read_only_relocs suppress -o .libs/lqt_x264.so -bundle .libs/x264.o .libs/lqt_x264.o ../../src/.libs/libquicktime.a $CONTRIB/lib/libx264.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_x264.so $CONTRIB/lib/libquicktime && cd ../ffmpeg && " ; - POST_LibQT += "gcc -flat_namespace -undefined suppress -read_only_relocs suppress -o .libs/lqt_ffmpeg.so -bundle .libs/lqt_ffmpeg.o .libs/audio.o .libs/video.o .libs/params.o ../../src/.libs/libquicktime.a $CONTRIB/lib/libavcodec.a $CONTRIB/lib/libavutil.a $CONTRIB/lib/libavformat.a -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lm -lz -ldl && " ; - POST_LibQT += "cp .libs/lqt_ffmpeg.so $CONTRIB/lib/libquicktime && cd ../.. && " ; - } - else - { - # Rebuild plugins using static libraries to reduice dependencies at runtime. - POST_LibQT = "cd plugins/faac && " ; - POST_LibQT += "gcc -shared .libs/faac.o .libs/lqt_faac.o $CONTRIB/libquicktime/src/.libs/libquicktime.a -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L$CONTRIB/lib -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_faac.so -o .libs/lqt_faac.so && " ; - POST_LibQT += "cp .libs/lqt_faac.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../audiocodec && gcc -shared .libs/ima4.o .libs/pcm.o .libs/lqt_audiocodec.o ../../src/.libs/libquicktime.a -Wl,--rpath -Wl,$CONTRIB//libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB//lib -L$CONTRIB//lib -L$CONTRIB//libquicktime/src/.libs -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_audiocodec.so -o .libs/lqt_audiocodec.so && " ; - POST_LibQT += "cp .libs/lqt_audiocodec.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../rtjpeg && " ; - POST_LibQT += "gcc -shared .libs/rtjpeg_codec.o .libs/lqt_rtjpeg.o .libs/RTjpeg.o ../../src/.libs/libquicktime.a -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_rtjpeg.so -o .libs/lqt_rtjpeg.so && " ; - POST_LibQT += "cp .libs/lqt_rtjpeg.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../videocodec && " ; - POST_LibQT += "gcc -shared .libs/raw.o .libs/v210.o .libs/v308.o .libs/v408.o .libs/v410.o .libs/yuv2.o .libs/yuv4.o .libs/yv12.o .libs/lqt_videocodec.o ../../src/.libs/libquicktime.a -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_videocodec.so -o .libs/lqt_videocodec.so && " ; - POST_LibQT += "cp .libs/lqt_videocodec.so $CONTRIB/lib/libquicktime && " ; - POST_LibQT += "cd ../lame && " ; - POST_LibQT += "gcc -shared .libs/lame_codec.o .libs/lqt_lame.o $CONTRIB/libquicktime/src/.libs/libquicktime.a -Wl,--whole-archive $CONTRIB/lib/libmp3lame.a -Wl,--no-whole-archive -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L/home/pri/Desktop/0.8.0b2_5.1_383/contrib/lib -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_lame.so -o .libs/lqt_lame.so && " ; - POST_LibQT += "cp .libs/lqt_lame.so $CONTRIB/lib/libquicktime && cd ../x264 && " ; - POST_LibQT += "gcc -shared .libs/x264.o .libs/lqt_x264.o $CONTRIB/libquicktime/src/.libs/libquicktime.a $CONTRIB/lib/libx264.a -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L$CONTRIB/lib -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_x264.so -o .libs/lqt_x264.so && " ; - POST_LibQT += "cp .libs/lqt_x264.so $CONTRIB/lib/libquicktime && cd ../ffmpeg && " ; - POST_LibQT += "gcc -shared .libs/lqt_ffmpeg.o .libs/audio.o .libs/video.o .libs/params.o $CONTRIB/lib/libavcodec.a $CONTRIB/lib/libavutil.a $CONTRIB/lib/libavformat.a $CONTRIB/libquicktime/src/.libs/libquicktime.a -Wl,--rpath -Wl,$CONTRIB/libquicktime/src/.libs -Wl,--rpath -Wl,$CONTRIB/lib -L$CONTRIB/lib -lpthread -lm -lz -ldl -Wl,-soname -Wl,lqt_ffmpeg.so -o .libs/lqt_ffmpeg.so && " ; - POST_LibQT += "cp .libs/lqt_ffmpeg.so $CONTRIB/lib/libquicktime && cd ../.. && " ; - } - - Depends $(<) : $(>) ; - Depends lib : $(<) ; - } - actions LibQT - { - cd `dirname $(>)` && CONTRIB=`pwd` && - rm -rf libquicktime && tar xzf libquicktime.tar.gz && - export LDFLAGS="$LDFLAGS -L$CONTRIB/lib -L$CONTRIB/libquicktime/src/.libs -I$CONTRIB/include" && export CPPFLAGS="$CPPFLAGS -I$CONTRIB/include" - cd libquicktime && patch -p1 < ../patch-libquicktime.patch && - ./configure --prefix=$CONTRIB --enable-shared --enable-static --enable-gpl --with-faac=$CONTRIB --with-x264=$CONTRIB --with-avcodec=$CONTRIB && make && make install && $(POST_LibQT) - strip -S $CONTRIB/lib/libquicktime.a && touch $CONTRIB/.contrib - } - Wget $(SUBDIR)/libquicktime.tar.gz : $(SUBDIR)/version_qt.txt ; - LibQT $(SUBDIR)/lib/libquicktime.a : $(SUBDIR)/libquicktime.tar.gz ; - -} diff --git a/libhb/Makefile b/libhb/Makefile index d0d304315..902877561 100644 --- a/libhb/Makefile +++ b/libhb/Makefile @@ -17,7 +17,7 @@ ifeq ($(SYSTEM),NetBSD) endif ifeq ($(SYSTEM),Linux) - SYSDEF = -DSYS_LINUX $(HB_DEFPPC) + SYSDEF = -DSYS_LINUX $(HB_DEFPPC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 LDFLAGS += -lpthread -lm -ldl endif diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 37f9f88cb..a4d0f7cbe 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -720,7 +720,6 @@ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 "; OTHER_LDFLAGS = ( ../contrib/lib/libmp4v2.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, ../contrib/lib/libavcodec.a, @@ -777,7 +776,6 @@ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 "; OTHER_LDFLAGS = ( ../contrib/lib/libmp4v2.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, ../contrib/lib/libavcodec.a, @@ -832,7 +830,6 @@ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 "; OTHER_LDFLAGS = ( ../contrib/lib/libmp4v2.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, ../contrib/lib/libavcodec.a, @@ -1182,7 +1179,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1223,7 +1219,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1262,7 +1257,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1309,7 +1303,6 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1355,7 +1348,6 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1399,7 +1391,6 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1443,7 +1434,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1489,7 +1479,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1533,7 +1522,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, diff --git a/test/Makefile b/test/Makefile index e368f8c6c..0f021cc1d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,9 +1,9 @@ SYSTEM = $(shell uname -s) ifeq ($(SYSTEM),CYGWIN_NT-5.1) - LIBS = a52 avformat avcodec avutil dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 quicktime + LIBS = a52 avformat avcodec avutil dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 else - LIBS = a52 avformat avcodec avutil dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 quicktime + LIBS = a52 avformat avcodec avutil dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 endif all: ../HandBrakeCLI |