diff options
| -rw-r--r-- | multimedia/vlc/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-libmatroska | 28 |
3 files changed, 7 insertions, 35 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ffb65731db1d..c452f2d8ac77 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vlc -DISTVERSION= 1.1.7 -PORTREVISION= 4 +DISTVERSION= 1.1.8 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -99,9 +98,10 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include \ - ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg \ - ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib \ +CPPFLAGS+= -I${FAKEDIR}/include -I${WRKSRC}/include \ + -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg \ + ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib \ -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" LIBS="-lc" CONFIGURE_ARGS+= --enable-vlc \ diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index c382cf3b48ac..cdc403355c5e 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,2 +1,2 @@ -SHA256 (vlc-1.1.7.tar.bz2) = 28059ef17d0866c3d9d5808fb6bf56783f72486b1b80f7ea8f6106612db0c1d5 -SIZE (vlc-1.1.7.tar.bz2) = 24635812 +SHA256 (vlc-1.1.8.tar.bz2) = fb1ff7ed861a67510cdf91e8f3c1d23687a0db3ede78bf2baf292417aedabfb4 +SIZE (vlc-1.1.8.tar.bz2) = 25212756 diff --git a/multimedia/vlc/files/patch-libmatroska b/multimedia/vlc/files/patch-libmatroska deleted file mode 100644 index 894bb6178cec..000000000000 --- a/multimedia/vlc/files/patch-libmatroska +++ /dev/null @@ -1,28 +0,0 @@ ---- modules/demux/mkv/matroska_segment.cpp.orig 2011-02-28 22:00:54.000000000 +0100 -+++ modules/demux/mkv/matroska_segment.cpp 2011-02-28 22:05:50.000000000 +0100 -@@ -220,6 +220,7 @@ void matroska_segment_c::LoadTags( KaxTa - } - ep->Up(); - } -+#if 0 - else if( MKV_IS_ID( el, KaxTagGeneral ) ) - { - msg_Dbg( &sys.demuxer, "| + General" ); -@@ -288,6 +289,7 @@ void matroska_segment_c::LoadTags( KaxTa - { - msg_Dbg( &sys.demuxer, "| + Multi Title" ); - } -+#endif - else - { - msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() ); ---- modules/demux/mkv/mkv.hpp.orig 2011-02-28 22:00:45.000000000 +0100 -+++ modules/demux/mkv/mkv.hpp 2011-02-28 22:04:10.000000000 +0100 -@@ -92,7 +92,6 @@ - #include "matroska/KaxSegment.h" - #include "matroska/KaxTag.h" - #include "matroska/KaxTags.h" --#include "matroska/KaxTagMulti.h" - #include "matroska/KaxTracks.h" - #include "matroska/KaxTrackAudio.h" - #include "matroska/KaxTrackVideo.h" |