From 0b9609d6c9c3a52d9855d96cfd8a29a74b37159a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 28 May 2012 18:44:26 +0000 Subject: [PATCH] Finally unbreak and enable RTP/RTSP support \o/ from Brad (maintainer) --- x11/vlc/Makefile | 20 ++++++++++++-------- x11/vlc/patches/patch-configure_ac | 13 +++++++++++-- x11/vlc/pkg/PLIST-main | 3 ++- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 9596628151a..2cfe2f30adb 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.147 2012/05/03 06:51:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.148 2012/05/28 18:44:26 ajacoutot Exp $ SHARED_ONLY= Yes @@ -8,7 +8,7 @@ COMMENT-jack= JACK audio output module for VLC V= 2.0.1 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} -REVISION-main= 0 +REVISION-main= 1 PKGNAME-jack= vlc-jack-${V} CATEGORIES= x11 MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ @@ -37,7 +37,7 @@ WANTLIB-main= GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 Xau \ gmp gnutls gobject-2.0 gpg-error gsm gthread-2.0 gtk-x11-2.0 \ hogweed jpeg matroska mp3lame nettle notify orc-0.4 ogg \ p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ - png portaudio postproc proxy pthread-stubs pthread samplerate \ + png portaudio postproc pthread-stubs pthread samplerate \ sndio schroedinger-1.0>=2.0 sndio speex speexdsp swscale tag \ tar tasn1 tiff theoradec theoraenc usbhid vorbis vorbisenc \ vpx webp x264 xcb-composite xcb-keysyms xcb-randr xcb-render \ @@ -77,7 +77,6 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \ multimedia/libmatroska \ multimedia/schroedinger>=1.0.10 \ multimedia/x264 \ - net/libproxy \ security/gnutls \ security/libgcrypt \ textproc/libebml \ @@ -87,7 +86,8 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \ LIB_DEPENDS-jack= ${LIB_DEPENDS} \ ${BUILD_PKGPATH} \ audio/jack -BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ +BUILD_DEPENDS= net/livemedia>=20120204p0 \ + ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ devel/libtool RUN_DEPENDS-main= devel/desktop-file-utils \ @@ -99,7 +99,8 @@ MAKE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSI CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng USE_GMAKE= Yes -USE_LIBTOOL= Yes +# Fails to link _pic libs properly resulting in undefined symbols in the live555 plugin +USE_LIBTOOL= gnu LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autotools @@ -121,9 +122,9 @@ CONFIGURE_ARGS+=--disable-a52 \ --disable-goom \ --disable-kate \ --disable-libmpeg2 \ + --disable-libproxy \ --disable-libva \ --disable-linsys \ - --disable-live555 \ --disable-lua \ --disable-mad \ --disable-mod \ @@ -149,7 +150,10 @@ CONFIGURE_ARGS+=--disable-a52 \ --without-contrib \ --without-tuning CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/live/liveMedia \ + -L${LOCALBASE}/live/groupsock -L${LOCALBASE}/live/BasicUsageEnvironment \ + -L${LOCALBASE}/live/UsageEnvironment" \ + LOCALBASE="${LOCALBASE}" \ PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" PSEUDO_FLAVORS= no_jack diff --git a/x11/vlc/patches/patch-configure_ac b/x11/vlc/patches/patch-configure_ac index b59e8321bf3..9d71bef7fae 100644 --- a/x11/vlc/patches/patch-configure_ac +++ b/x11/vlc/patches/patch-configure_ac @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_ac,v 1.21 2012/04/23 13:47:08 ajacoutot Exp $ +$OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ --- configure.ac.orig Thu Mar 8 07:18:41 2012 -+++ configure.ac Fri Mar 30 19:07:47 2012 ++++ configure.ac Sun May 20 22:42:19 2012 @@ -122,10 +122,6 @@ case "${host_os}" in ;; openbsd*) @@ -67,6 +67,15 @@ $OpenBSD: patch-configure_ac,v 1.21 2012/04/23 13:47:08 ajacoutot Exp $ VLC_RESTORE_FLAGS CFLAGS="${CFLAGS} ${C_O}" CXXFLAGS="${CXXFLAGS} ${C_O}" +@@ -1735,7 +1718,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}" + AC_LANG_PUSH(C++) + CPPFLAGS_save="${CPPFLAGS}" + AS_IF([test -z "${CONTRIB_DIR}"], [ +- CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment" ++ CPPFLAGS_live555="-I${LOCALBASE}/live/liveMedia/include -I${LOCALBASE}/live/groupsock/include -I${LOCALBASE}/live/BasicUsageEnvironment/include -I${LOCALBASE}/live/UsageEnvironment/include" + ], [ + CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" + ]) @@ -3511,6 +3494,24 @@ AS_IF([test "$enable_oss" != "no"], [ ]) AC_SUBST(OSS_LIBS) diff --git a/x11/vlc/pkg/PLIST-main b/x11/vlc/pkg/PLIST-main index 54219c0360a..bba7d251d86 100644 --- a/x11/vlc/pkg/PLIST-main +++ b/x11/vlc/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.22 2012/05/03 06:51:25 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.23 2012/05/28 18:44:26 ajacoutot Exp $ @pkgpath x11/vlc %%amd64%% %%i386%% @@ -222,6 +222,7 @@ lib/vlc/plugins/demux/libes_plugin.so lib/vlc/plugins/demux/libflacsys_plugin.so lib/vlc/plugins/demux/libh264_plugin.so lib/vlc/plugins/demux/libimage_plugin.so +lib/vlc/plugins/demux/liblive555_plugin.so lib/vlc/plugins/demux/libmjpeg_plugin.so lib/vlc/plugins/demux/libmkv_plugin.so lib/vlc/plugins/demux/libmp4_plugin.so