diff options
| author | ahze <ahze@FreeBSD.org> | 2005-03-14 02:10:35 +0000 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-03-14 02:10:35 +0000 |
| commit | 1c480e93acc84bdaf46ca79d8f6a7e29615be8de (patch) | |
| tree | a247c6eb4a6def1580d0c316e602766a173523da /multimedia/mpeg4ip | |
| parent | 1bdfa18e4180ee632920d5ab653c76eb514da39c (diff) | |
| download | FreeBSD-ports-1c480e93acc84bdaf46ca79d8f6a7e29615be8de.zip FreeBSD-ports-1c480e93acc84bdaf46ca79d8f6a7e29615be8de.tar.gz | |
- Don't use gcc34 on 4.x by adding -O2 to CFLAGS
- Use USE_LIBTOOL_VER instead of USE_INC_LIBTOOL_VER since we don't have
USE_GCC=3.4 anymore
Diffstat (limited to 'multimedia/mpeg4ip')
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/files/patch-lib::SDLAudio::ltmain.sh | 15 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/files/patch-ltmain.sh | 15 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/pkg-plist | 6 |
4 files changed, 9 insertions, 35 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index f141c92..46d9260 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -25,12 +25,10 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 -USE_GNOME= \ - gtk20 \ - lthack +USE_GNOME= gtk20 USE_SDL= sdl USE_GMAKE= yes -USE_INC_LIBTOOL_VER=15 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" @@ -96,7 +94,7 @@ MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib::sdp::sdp_decode.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp .else -USE_GCC= 3.4 +CFLAGS+= -O2 .endif ### diff --git a/multimedia/mpeg4ip/files/patch-lib::SDLAudio::ltmain.sh b/multimedia/mpeg4ip/files/patch-lib::SDLAudio::ltmain.sh deleted file mode 100644 index 042b9d7..0000000 --- a/multimedia/mpeg4ip/files/patch-lib::SDLAudio::ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/SDLAudio/ltmain.sh.orig Sun Nov 7 21:50:06 2004 -+++ lib/SDLAudio/ltmain.sh Sun Nov 7 21:50:28 2004 -@@ -5425,10 +5425,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/mpeg4ip/files/patch-ltmain.sh b/multimedia/mpeg4ip/files/patch-ltmain.sh deleted file mode 100644 index b7b985b..0000000 --- a/multimedia/mpeg4ip/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Thu Sep 30 04:09:46 2004 -+++ ltmain.sh Thu Sep 30 04:11:06 2004 -@@ -5425,10 +5425,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist index 77fe096..7812d60 100644 --- a/multimedia/mpeg4ip/pkg-plist +++ b/multimedia/mpeg4ip/pkg-plist @@ -30,17 +30,23 @@ include/sdp.h include/sdp_error.h lib/libhttp.so lib/libhttp.so.0 +lib/libmp4.a lib/libmp4.so lib/libmp4.so.0 +lib/libmp4av.a lib/libmp4av.so lib/libmp4av.so.0 +lib/libmp4util.a lib/libmp4util.so lib/libmp4util.so.0 lib/libmpeg4ipSDL-1.2.so lib/libmpeg4ipSDL-1.2.so.7 +lib/libmpeg4ipSDL.a lib/libmpeg4ipSDL.so +lib/libmsg_queue.a lib/libmsg_queue.so lib/libmsg_queue.so.0 +lib/libsdp.a lib/libsdp.so lib/libsdp.so.0 lib/mp4player_plugin/a52_audio_plugin.so |
