From 03d4044cc8da243ac1e4a8ade08745057d96aa1d Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 7 May 2006 17:33:05 +0000 Subject: - Update the MASTER_SITES to fix the fetch. - Fix the build if multimedia/x264 is installed in system. [1] - Add --exclude in extract to not extract beos, macosx, liba52, libavcodec, libdvdcss and other un-need directories to make sure they do build with the system (use external dependencies) libraries. Only keep libx264. - Remove a few missing leftover of ffmpeg in post-patch and in one of patch. - Add '-dx' in jam by default to give the verbose of build. Easier for me to collect the bug report or/and read in log from tinderboxes. - Clean distinfo, remove a leftover of ffmpeg and add SHA256. - Clean pkg-descr to make it looks nicer. - Make portlint a bit happier. Before anyone ask/request me to update it to 7.x. I don't know yet, I haven't dig in what 7.x has. I think, this port needs to have a good last clean up before update it to 7.x. PR: ports/88838 [1] Reported by: Zach Dykstra [1], bite on me too --- multimedia/handbrake-gtk2/Makefile | 25 +++++++++++--- multimedia/handbrake-gtk2/distinfo | 3 +- multimedia/handbrake-gtk2/files/patch-core_Jamfile | 38 +++++++++++++--------- multimedia/handbrake-gtk2/pkg-descr | 10 +++--- multimedia/handbrake/Makefile | 25 +++++++++++--- multimedia/handbrake/distinfo | 3 +- multimedia/handbrake/files/patch-core_Jamfile | 38 +++++++++++++--------- multimedia/handbrake/pkg-descr | 10 +++--- 8 files changed, 94 insertions(+), 58 deletions(-) (limited to 'multimedia') diff --git a/multimedia/handbrake-gtk2/Makefile b/multimedia/handbrake-gtk2/Makefile index dd4a94a730db..0e36254af25d 100644 --- a/multimedia/handbrake-gtk2/Makefile +++ b/multimedia/handbrake-gtk2/Makefile @@ -9,7 +9,7 @@ PORTNAME= handbrake PORTVERSION= 0.6.2 PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= http://people.via.ecp.fr/~titer/handbrake/ +MASTER_SITES= http://download.m0k.org/${PORTNAME}/ DISTNAME= HandBrake-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org @@ -34,11 +34,26 @@ PLIST_FILES= bin/handbrake WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} USE_GNOME= gtk20 -USE_REINPLACE= yes USE_X_PREFIX= yes SYSCTL_CMD?= /sbin/sysctl +EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude beos \ + --exclude macosx \ + --exclude packageOSX.sh \ + --exclude contrib/liba52 \ + --exclude contrib/libavcodec \ + --exclude contrib/libdvdcss \ + --exclude contrib/libdvdread \ + --exclude contrib/libfaac \ + --exclude contrib/libmp3lame \ + --exclude contrib/libmp4v2 \ + --exclude contrib/libmpeg2 \ + --exclude contrib/libogg \ + --exclude contrib/libsamplerate \ + --exclude contrib/libvorbis \ + --exclude contrib/libxvidcore + .include .if ${OSVERSION} < 500000 @@ -49,18 +64,18 @@ WITH_DVD_DEVICE?= acd0c WITH_DVD_DEVICE?= acd0 .endif +# jam -dx, it will giving a verbose of build. do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam -dx) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake post-patch: @${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \ - -e 's:%%LIBAVCODEC%%:${FFMPEG_SRC_DIR}/libavcodec:g' \ -e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \ -e 's:%%CC%%:${CC}:g' -e 's:%%CXX%%:${CXX}:g' \ - -e 's:%%CFLAGS%%:${CFLAGS}:g' \ + -e 's:-g ::g' -e 's:%%CFLAGS%%:${CFLAGS}:g' \ ${BUILD_WRKSRC}/Jamfile ${BUILD_WRKSRC}/core/Jamfile \ ${BUILD_WRKSRC}/Jamrules @${REINPLACE_CMD} -e 's:%%DVD_DEVICE%%:${WITH_DVD_DEVICE}:g' \ diff --git a/multimedia/handbrake-gtk2/distinfo b/multimedia/handbrake-gtk2/distinfo index f2f25d8e9179..e94b3870b00c 100644 --- a/multimedia/handbrake-gtk2/distinfo +++ b/multimedia/handbrake-gtk2/distinfo @@ -1,4 +1,3 @@ MD5 (HandBrake-0.6.2-src.tar.gz) = a787787622cfa5411c13b7a4bc057ea5 +SHA256 (HandBrake-0.6.2-src.tar.gz) = 1efa2778ad0955e0f19769de23a25dd137c34b6695d4014f99b959300d49b6a4 SIZE (HandBrake-0.6.2-src.tar.gz) = 1992682 -MD5 (ffmpeg-20041113.tar.bz2) = 245bbbb766f43722826358a938afd9a9 -SIZE (ffmpeg-20041113.tar.bz2) = 1472726 diff --git a/multimedia/handbrake-gtk2/files/patch-core_Jamfile b/multimedia/handbrake-gtk2/files/patch-core_Jamfile index 7559149b0a51..9efc0a2e751d 100644 --- a/multimedia/handbrake-gtk2/files/patch-core_Jamfile +++ b/multimedia/handbrake-gtk2/files/patch-core_Jamfile @@ -1,17 +1,15 @@ ---- core/Jamfile.orig Wed May 26 05:51:32 2004 -+++ core/Jamfile Mon Nov 22 20:28:52 2004 -@@ -15,25 +15,12 @@ - Library libhb : $(LIBHB_SRC) ; - - # Sadly, we might want to debug our code --ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ; -+ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W -I%%PREFIX%%/include ; - +--- core/Jamfile.orig Sun May 7 11:49:29 2006 ++++ core/Jamfile Sun May 7 11:54:18 2006 +@@ -18,22 +18,19 @@ + ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ; + # Needed includes -ObjectHdrs Ac3Dec.c : $(TOP)/contrib/liba52 ; - ObjectHdrs FfmpegEnc.c -- HandBrake.c -- MpgaDec.c +-ObjectHdrs FfmpegEnc.c ++ObjectHdrs Ac3Dec.c ++ FfmpegEnc.c + HandBrake.c + MpgaDec.c - Scale.c : $(TOP)/contrib/libavcodec ; -ObjectHdrs DVDRead.c - Scan.c : $(TOP)/contrib/libdvdread ; @@ -24,9 +22,17 @@ -ObjectHdrs OgmMux.c - VorbisEnc.c : $(TOP)/contrib/libogg ; -ObjectHdrs VorbisEnc.c : $(TOP)/contrib/libvorbis ; -+ HandBrake.c -+ MpgaDec.c -+ Scale.c : %%LIBAVCODEC%% ; ++ Scale.c ++ DVDRead.c ++ Scan.c ++ FaacEnc.c ++ Mp3Enc.c ++ Mp4Mux.c ++ Mpeg2Dec.c ++ Resample.c ++ OgmMux.c ++ VorbisEnc.c ++ XvidEnc.c : %%PREFIX%%/include ; ObjectHdrs X264Enc.c : $(TOP)/contrib/libx264 ; -ObjectHdrs XvidEnc.c : $(TOP)/contrib/libxvidcore ; - +- diff --git a/multimedia/handbrake-gtk2/pkg-descr b/multimedia/handbrake-gtk2/pkg-descr index 10fc32f61e54..9a9b8b725186 100644 --- a/multimedia/handbrake-gtk2/pkg-descr +++ b/multimedia/handbrake-gtk2/pkg-descr @@ -1,12 +1,10 @@ -HandBrake is a GPL'd multi-platform, multithreaded DVD to MPEG-4 -ripper and -converter. HandBrake was originally available on the BeOS, but now has -been +HandBrake is a GPL'd multi-platform, multithreaded DVD to MPEG-4 ripper and +converter. HandBrake was originally available on the BeOS, but now has been ported over to MacOS X, GNU/Linux and FreeBSD. Features: - * Can encode directly from DVDs (even encrypted ones) or from -VIDEO_TS folders + * Can encode directly from DVDs (even encrypted ones) or from VIDEO_TS + folders * Supports AC3, LPCM and MPEG audio tracks * Outputs MP4, AVI or OGM files * Outputs AAC, MP3 or Vorbis audio diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index dd4a94a730db..0e36254af25d 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -9,7 +9,7 @@ PORTNAME= handbrake PORTVERSION= 0.6.2 PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= http://people.via.ecp.fr/~titer/handbrake/ +MASTER_SITES= http://download.m0k.org/${PORTNAME}/ DISTNAME= HandBrake-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org @@ -34,11 +34,26 @@ PLIST_FILES= bin/handbrake WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} USE_GNOME= gtk20 -USE_REINPLACE= yes USE_X_PREFIX= yes SYSCTL_CMD?= /sbin/sysctl +EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude beos \ + --exclude macosx \ + --exclude packageOSX.sh \ + --exclude contrib/liba52 \ + --exclude contrib/libavcodec \ + --exclude contrib/libdvdcss \ + --exclude contrib/libdvdread \ + --exclude contrib/libfaac \ + --exclude contrib/libmp3lame \ + --exclude contrib/libmp4v2 \ + --exclude contrib/libmpeg2 \ + --exclude contrib/libogg \ + --exclude contrib/libsamplerate \ + --exclude contrib/libvorbis \ + --exclude contrib/libxvidcore + .include .if ${OSVERSION} < 500000 @@ -49,18 +64,18 @@ WITH_DVD_DEVICE?= acd0c WITH_DVD_DEVICE?= acd0 .endif +# jam -dx, it will giving a verbose of build. do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam -dx) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake post-patch: @${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \ - -e 's:%%LIBAVCODEC%%:${FFMPEG_SRC_DIR}/libavcodec:g' \ -e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \ -e 's:%%CC%%:${CC}:g' -e 's:%%CXX%%:${CXX}:g' \ - -e 's:%%CFLAGS%%:${CFLAGS}:g' \ + -e 's:-g ::g' -e 's:%%CFLAGS%%:${CFLAGS}:g' \ ${BUILD_WRKSRC}/Jamfile ${BUILD_WRKSRC}/core/Jamfile \ ${BUILD_WRKSRC}/Jamrules @${REINPLACE_CMD} -e 's:%%DVD_DEVICE%%:${WITH_DVD_DEVICE}:g' \ diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo index f2f25d8e9179..e94b3870b00c 100644 --- a/multimedia/handbrake/distinfo +++ b/multimedia/handbrake/distinfo @@ -1,4 +1,3 @@ MD5 (HandBrake-0.6.2-src.tar.gz) = a787787622cfa5411c13b7a4bc057ea5 +SHA256 (HandBrake-0.6.2-src.tar.gz) = 1efa2778ad0955e0f19769de23a25dd137c34b6695d4014f99b959300d49b6a4 SIZE (HandBrake-0.6.2-src.tar.gz) = 1992682 -MD5 (ffmpeg-20041113.tar.bz2) = 245bbbb766f43722826358a938afd9a9 -SIZE (ffmpeg-20041113.tar.bz2) = 1472726 diff --git a/multimedia/handbrake/files/patch-core_Jamfile b/multimedia/handbrake/files/patch-core_Jamfile index 7559149b0a51..9efc0a2e751d 100644 --- a/multimedia/handbrake/files/patch-core_Jamfile +++ b/multimedia/handbrake/files/patch-core_Jamfile @@ -1,17 +1,15 @@ ---- core/Jamfile.orig Wed May 26 05:51:32 2004 -+++ core/Jamfile Mon Nov 22 20:28:52 2004 -@@ -15,25 +15,12 @@ - Library libhb : $(LIBHB_SRC) ; - - # Sadly, we might want to debug our code --ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ; -+ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W -I%%PREFIX%%/include ; - +--- core/Jamfile.orig Sun May 7 11:49:29 2006 ++++ core/Jamfile Sun May 7 11:54:18 2006 +@@ -18,22 +18,19 @@ + ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ; + # Needed includes -ObjectHdrs Ac3Dec.c : $(TOP)/contrib/liba52 ; - ObjectHdrs FfmpegEnc.c -- HandBrake.c -- MpgaDec.c +-ObjectHdrs FfmpegEnc.c ++ObjectHdrs Ac3Dec.c ++ FfmpegEnc.c + HandBrake.c + MpgaDec.c - Scale.c : $(TOP)/contrib/libavcodec ; -ObjectHdrs DVDRead.c - Scan.c : $(TOP)/contrib/libdvdread ; @@ -24,9 +22,17 @@ -ObjectHdrs OgmMux.c - VorbisEnc.c : $(TOP)/contrib/libogg ; -ObjectHdrs VorbisEnc.c : $(TOP)/contrib/libvorbis ; -+ HandBrake.c -+ MpgaDec.c -+ Scale.c : %%LIBAVCODEC%% ; ++ Scale.c ++ DVDRead.c ++ Scan.c ++ FaacEnc.c ++ Mp3Enc.c ++ Mp4Mux.c ++ Mpeg2Dec.c ++ Resample.c ++ OgmMux.c ++ VorbisEnc.c ++ XvidEnc.c : %%PREFIX%%/include ; ObjectHdrs X264Enc.c : $(TOP)/contrib/libx264 ; -ObjectHdrs XvidEnc.c : $(TOP)/contrib/libxvidcore ; - +- diff --git a/multimedia/handbrake/pkg-descr b/multimedia/handbrake/pkg-descr index 10fc32f61e54..9a9b8b725186 100644 --- a/multimedia/handbrake/pkg-descr +++ b/multimedia/handbrake/pkg-descr @@ -1,12 +1,10 @@ -HandBrake is a GPL'd multi-platform, multithreaded DVD to MPEG-4 -ripper and -converter. HandBrake was originally available on the BeOS, but now has -been +HandBrake is a GPL'd multi-platform, multithreaded DVD to MPEG-4 ripper and +converter. HandBrake was originally available on the BeOS, but now has been ported over to MacOS X, GNU/Linux and FreeBSD. Features: - * Can encode directly from DVDs (even encrypted ones) or from -VIDEO_TS folders + * Can encode directly from DVDs (even encrypted ones) or from VIDEO_TS + folders * Supports AC3, LPCM and MPEG audio tracks * Outputs MP4, AVI or OGM files * Outputs AAC, MP3 or Vorbis audio -- cgit