diff options
| author | ahze <ahze@FreeBSD.org> | 2004-11-25 12:01:29 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2004-11-25 12:01:29 +0800 |
| commit | 23b44ca405bdad4007294c39b8e11940eb74a87b (patch) | |
| tree | e042cb100396e91009508d7446ce778177d2ea46 /multimedia | |
| parent | b050ee7d212fe424affbeb7909fc263d22918489 (diff) | |
| download | freebsd-ports-gnome-23b44ca405bdad4007294c39b8e11940eb74a87b.tar.gz freebsd-ports-gnome-23b44ca405bdad4007294c39b8e11940eb74a87b.tar.zst freebsd-ports-gnome-23b44ca405bdad4007294c39b8e11940eb74a87b.zip | |
Add USE_GETOPT_LONG to fix 4.x build
Remove faad from ffmpeg since no dvd's have mp4 audio.
PR: ports/74353
Submitted by: maintainer
Approved by: adamw (implicit)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/handbrake-gtk2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/handbrake-gtk2/files/patch-Jamfile | 4 | ||||
| -rw-r--r-- | multimedia/handbrake/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/handbrake/files/patch-Jamfile | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/multimedia/handbrake-gtk2/Makefile b/multimedia/handbrake-gtk2/Makefile index 278747613a4d..8012a975a15c 100644 --- a/multimedia/handbrake-gtk2/Makefile +++ b/multimedia/handbrake-gtk2/Makefile @@ -55,13 +55,14 @@ FFMPEG_CONFIGURE_ARGS+= --enable-gpl --disable-ffserver \ --enable-pthreads \ --enable-faac \ --enable-mp3lame \ - --enable-faad \ --enable-a52 \ --enable-xvid .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 +USE_GETOPT_LONG= yes +MAKE_ENV= EXTRA_LIBS="-lcipher" WITH_DVD_DEVICE?= acd0c .else WITH_DVD_DEVICE?= acd0 @@ -96,6 +97,7 @@ post-patch: ${FFMPEG_SRC_DIR}/libavcodec/xvidff.c .endif @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ + -e 's|-Wall||' \ ${FFMPEG_SRC_DIR}/configure cd ${FFMPEG_SRC_DIR} && \ ${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch diff --git a/multimedia/handbrake-gtk2/files/patch-Jamfile b/multimedia/handbrake-gtk2/files/patch-Jamfile index af6a54cdbd2b..beb1759b08a5 100644 --- a/multimedia/handbrake-gtk2/files/patch-Jamfile +++ b/multimedia/handbrake-gtk2/files/patch-Jamfile @@ -10,9 +10,9 @@ + SystemLibraries $(TEST_BIN) : %%LIBAVCODEC%%/libavcodec.a + -L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52 + -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2 -logg -+ -lsamplerate -lvorbis -lvorbisenc -lxvidcore ; ++ -lsamplerate -lvorbis -lvorbisenc -lxvidcore $(EXTRA_LIBS) ; + SystemLibraries $(GTK2_BIN) : %%LIBAVCODEC%%/libavcodec.a -+ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% `pkg-config gtk+-2.0 --libs` ++ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% $(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs` + -la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 + -lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ; + ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ; diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 278747613a4d..8012a975a15c 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -55,13 +55,14 @@ FFMPEG_CONFIGURE_ARGS+= --enable-gpl --disable-ffserver \ --enable-pthreads \ --enable-faac \ --enable-mp3lame \ - --enable-faad \ --enable-a52 \ --enable-xvid .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 +USE_GETOPT_LONG= yes +MAKE_ENV= EXTRA_LIBS="-lcipher" WITH_DVD_DEVICE?= acd0c .else WITH_DVD_DEVICE?= acd0 @@ -96,6 +97,7 @@ post-patch: ${FFMPEG_SRC_DIR}/libavcodec/xvidff.c .endif @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ + -e 's|-Wall||' \ ${FFMPEG_SRC_DIR}/configure cd ${FFMPEG_SRC_DIR} && \ ${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch diff --git a/multimedia/handbrake/files/patch-Jamfile b/multimedia/handbrake/files/patch-Jamfile index af6a54cdbd2b..beb1759b08a5 100644 --- a/multimedia/handbrake/files/patch-Jamfile +++ b/multimedia/handbrake/files/patch-Jamfile @@ -10,9 +10,9 @@ + SystemLibraries $(TEST_BIN) : %%LIBAVCODEC%%/libavcodec.a + -L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52 + -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2 -logg -+ -lsamplerate -lvorbis -lvorbisenc -lxvidcore ; ++ -lsamplerate -lvorbis -lvorbisenc -lxvidcore $(EXTRA_LIBS) ; + SystemLibraries $(GTK2_BIN) : %%LIBAVCODEC%%/libavcodec.a -+ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% `pkg-config gtk+-2.0 --libs` ++ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% $(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs` + -la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 + -lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ; + ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ; |