Hi, Please have a look to the following patches...
for net/liveMedia: Build static libraries (archives with symbol tables) using ar rather than building combined object files. A real static library allows the final link to omit objects that are not referenced and can be referenced multiple times on the command line without leading to multiple-definition errors. Also fix the library order in linker command lines for executables to work with real static libraries. Build shared libraries to be used by vlc. for x11/vlc: Unconditionally undefine inhibit and screensaver plugins: they are rubbish and probably work only under gnome (vlc hangs with these plugins on i386 too, if the dbus daemon is up and running). Adjust WANTLIB (this can probably be skipped, but while here...) Enable live555 plugin. Subliminal advertising: now you can enjoy Groove Salad via RTSP! $ vlc rtsp://64.202.98.91:554/gs.sdp :) :) ciao, david Index: net/livemedia/Makefile =================================================================== RCS file: /cvs/ports/net/livemedia/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- net/livemedia/Makefile 15 Apr 2009 08:22:11 -0000 1.9 +++ net/livemedia/Makefile 27 May 2010 08:32:37 -0000 @@ -1,16 +1,19 @@ # $OpenBSD: Makefile,v 1.9 2009/04/15 08:22:11 landry Exp $ -SHARED_ONLY= Yes - COMMENT= LIVE555 streaming media library DISTNAME= live.2009.04.07 -PKGNAME= liveMedia-20090407 +PKGNAME= liveMedia-20090407p0 CATEGORIES= net devel MASTER_SITES= http://comstyle.com/source/ HOMEPAGE= http://www.live555.com/liveMedia/ +SHARED_LIBS= BasicUsageEnvironment 0.0 \ + UsageEnvironment 0.0 \ + groupsock 0.0 \ + liveMedia 0.0 + # LGPLv2.1+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -32,6 +35,12 @@ CFLAGS+= -fPIC post-extract: @cp -f ${FILESDIR}/config.fixed-openbsd ${WRKSRC}/ +pre-configure: + ${SUBST_CMD} ${WRKSRC}/BasicUsageEnvironment/Makefile.tail \ + ${WRKSRC}/UsageEnvironment/Makefile.tail \ + ${WRKSRC}/groupsock/Makefile.tail \ + ${WRKSRC}/liveMedia/Makefile.tail + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/live ${INSTALL_DATA_DIR} ${PREFIX}/live/groupsock @@ -53,6 +62,20 @@ do-install: ${PREFIX}/live/groupsock/ ${INSTALL_DATA} ${WRKSRC}/liveMedia/libliveMedia.a \ ${PREFIX}/live/liveMedia/ + cd ${WRKSRC}/BasicUsageEnvironment && \ + ${INSTALL_DATA} \ + libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION} \ + ${PREFIX}/lib/ + cd ${WRKSRC}/UsageEnvironment && \ + ${INSTALL_DATA} \ + libUsageEnvironment.so.${LIBUsageEnvironment_VERSION} \ + ${PREFIX}/lib/ + cd ${WRKSRC}/groupsock && \ + ${INSTALL_DATA} \ + libgroupsock.so.${LIBgroupsock_VERSION} ${PREFIX}/lib/ + cd ${WRKSRC}/liveMedia && \ + ${INSTALL_DATA} \ + libliveMedia.so.${LIBliveMedia_VERSION} ${PREFIX}/lib/ cd ${WRKSRC}/BasicUsageEnvironment/include && \ ${INSTALL_DATA} *.hh ${PREFIX}/live/BasicUsageEnvironment/include/ cd ${WRKSRC}/UsageEnvironment/include && \ Index: net/livemedia/files/config.fixed-openbsd =================================================================== RCS file: /cvs/ports/net/livemedia/files/config.fixed-openbsd,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 config.fixed-openbsd --- net/livemedia/files/config.fixed-openbsd 19 Apr 2007 08:32:23 -0000 1.1.1.1 +++ net/livemedia/files/config.fixed-openbsd 27 May 2010 08:32:37 -0000 @@ -10,9 +10,11 @@ OBJ = o LINK = $(CXX) -o LINK_OPTS = -L. CONSOLE_LINK_OPTS = $(LINK_OPTS) -LIBRARY_LINK = $(LD) -o -LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic +LIBRARY_LINK = $(AR) cr +LIBRARY_LINK_OPTS = LIB_SUFFIX = a +LIBRARY_LINK_SHARED = $(CXX) -o +LIBRARY_LINK_OPTS_SHARED = $(LINK_OPTS) -shared -Wl,-soname,$@ LIBS_FOR_CONSOLE_APPLICATION = LIBS_FOR_GUI_APPLICATION = EXE = Index: net/livemedia/patches/patch-BasicUsageEnvironment_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-BasicUsageEnvironment_Makefile_tail diff -N net/livemedia/patches/patch-BasicUsageEnvironment_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-BasicUsageEnvironment_Makefile_tail 27 May 2010 08:32:37 -0000 @@ -0,0 +1,26 @@ +$OpenBSD$ +--- BasicUsageEnvironment/Makefile.tail.orig Thu May 27 07:57:50 2010 ++++ BasicUsageEnvironment/Makefile.tail Thu May 27 08:00:09 2010 +@@ -1,7 +1,8 @@ + ##### End of variables to change + + LIB = libBasicUsageEnvironment.$(LIB_SUFFIX) +-ALL = $(LIB) ++LIB_SHARED = libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION} ++ALL = $(LIB) $(LIB_SHARED) + all: $(ALL) + + OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \ +@@ -9,7 +10,11 @@ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnviron + DelayQueue.$(OBJ) BasicHashTable.$(OBJ) + + libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS) +- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ ++ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ ++ $(OBJS) ++ ++libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION}: $(OBJS) ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \ + $(OBJS) + + .$(C).$(OBJ): Index: net/livemedia/patches/patch-UsageEnvironment_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-UsageEnvironment_Makefile_tail diff -N net/livemedia/patches/patch-UsageEnvironment_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-UsageEnvironment_Makefile_tail 27 May 2010 08:32:37 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- UsageEnvironment/Makefile.tail.orig Thu May 27 08:03:35 2010 ++++ UsageEnvironment/Makefile.tail Thu May 27 08:05:12 2010 +@@ -1,13 +1,17 @@ + ##### End of variables to change + + USAGE_ENVIRONMENT_LIB = libUsageEnvironment.$(LIB_SUFFIX) +-ALL = $(USAGE_ENVIRONMENT_LIB) ++USAGE_ENVIRONMENT_LIB_SHARED = libUsageEnvironment.so.${LIBUsageEnvironment_VERSION} ++ALL = $(USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB_SHARED) + all: $(ALL) + + OBJS = UsageEnvironment.$(OBJ) HashTable.$(OBJ) strDup.$(OBJ) + + $(USAGE_ENVIRONMENT_LIB): $(OBJS) +- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) $(OBJS) ++ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) $(OBJS) ++ ++$(USAGE_ENVIRONMENT_LIB_SHARED): $(OBJS) ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) $(OBJS) + + .$(C).$(OBJ): + $(C_COMPILER) -c $(C_FLAGS) $< Index: net/livemedia/patches/patch-groupsock_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-groupsock_Makefile_tail diff -N net/livemedia/patches/patch-groupsock_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-groupsock_Makefile_tail 27 May 2010 08:32:38 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- groupsock/Makefile.tail.orig Thu May 27 08:05:27 2010 ++++ groupsock/Makefile.tail Thu May 27 08:07:20 2010 +@@ -1,6 +1,6 @@ + ##### End of variables to change + +-ALL = libgroupsock.$(LIB_SUFFIX) ++ALL = libgroupsock.$(LIB_SUFFIX) libgroupsock.so.${LIBgroupsock_VERSION} + all: $(ALL) + + .$(C).$(OBJ): +@@ -27,7 +27,12 @@ IOHandlers.$(CPP): include/IOHandlers.hh include/Tunne + + libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \ + $(PLATFORM_SPECIFIC_LIB_OBJS) +- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ ++ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ ++ $(GROUPSOCK_LIB_OBJS) ++ ++libgroupsock.so.${LIBgroupsock_VERSION}: $(GROUPSOCK_LIB_OBJS) \ ++ $(PLATFORM_SPECIFIC_LIB_OBJS) ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \ + $(GROUPSOCK_LIB_OBJS) + + clean: Index: net/livemedia/patches/patch-liveMedia_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-liveMedia_Makefile_tail diff -N net/livemedia/patches/patch-liveMedia_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-liveMedia_Makefile_tail 27 May 2010 08:32:38 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ +--- liveMedia/Makefile.tail.orig Thu May 27 07:53:14 2010 ++++ liveMedia/Makefile.tail Thu May 27 07:57:29 2010 +@@ -1,7 +1,8 @@ + ##### End of variables to change + + LIVEMEDIA_LIB = libliveMedia.$(LIB_SUFFIX) +-ALL = $(LIVEMEDIA_LIB) ++LIVEMEDIA_LIB_SHARED = libliveMedia.so.${LIBliveMedia_VERSION} ++ALL = $(LIVEMEDIA_LIB) $(LIVEMEDIA_LIB_SHARED) + all: $(ALL) + + .$(C).$(OBJ): +@@ -45,7 +46,12 @@ LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) + + $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \ + $(PLATFORM_SPECIFIC_LIB_OBJS) +- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ ++ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ ++ $(LIVEMEDIA_LIB_OBJS) ++ ++$(LIVEMEDIA_LIB_SHARED): $(LIVEMEDIA_LIB_OBJS) \ ++ $(PLATFORM_SPECIFIC_LIB_OBJS) ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \ + $(LIVEMEDIA_LIB_OBJS) + + Media.$(CPP): include/Media.hh Index: net/livemedia/patches/patch-mediaServer_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-mediaServer_Makefile_tail diff -N net/livemedia/patches/patch-mediaServer_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-mediaServer_Makefile_tail 27 May 2010 08:32:38 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- mediaServer/Makefile.tail.orig Thu May 27 08:00:24 2010 ++++ mediaServer/Makefile.tail Thu May 27 08:02:25 2010 +@@ -25,11 +25,11 @@ LIVEMEDIA_LIB = $(LIVEMEDIA_DIR)/libliveMedia.$(LIB_SU + GROUPSOCK_DIR = ../groupsock + GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX) + LOCAL_LIBS = $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \ +- $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) ++ $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB) + LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION) + + live555MediaServer$(EXE): $(MEDIA_SERVER_OBJS) $(LOCAL_LIBS) +- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MEDIA_SERVER_OBJS) $(LIBS) ++ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MEDIA_SERVER_OBJS) $(LIBS) + + clean: + -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~ Index: net/livemedia/patches/patch-testProgs_Makefile_tail =================================================================== RCS file: net/livemedia/patches/patch-testProgs_Makefile_tail diff -N net/livemedia/patches/patch-testProgs_Makefile_tail --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/patches/patch-testProgs_Makefile_tail 27 May 2010 08:32:38 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- testProgs/Makefile.tail.orig Thu May 27 08:02:39 2010 ++++ testProgs/Makefile.tail Thu May 27 08:03:16 2010 +@@ -59,11 +59,11 @@ LIVEMEDIA_LIB = $(LIVEMEDIA_DIR)/libliveMedia.$(LIB_SU + GROUPSOCK_DIR = ../groupsock + GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX) + LOCAL_LIBS = $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \ +- $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) ++ $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB) + LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION) + + testMP3Streamer$(EXE): $(MP3_STREAMER_OBJS) $(LOCAL_LIBS) +- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS) ++ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS) + testMP3Receiver$(EXE): $(MP3_RECEIVER_OBJS) $(LOCAL_LIBS) + $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_RECEIVER_OBJS) $(LIBS) + testRelay$(EXE): $(RELAY_OBJS) $(LOCAL_LIBS) Index: net/livemedia/pkg/PFRAG.shared =================================================================== RCS file: net/livemedia/pkg/PFRAG.shared diff -N net/livemedia/pkg/PFRAG.shared --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/livemedia/pkg/PFRAG.shared 27 May 2010 08:32:38 -0000 @@ -0,0 +1,5 @@ +...@comment $OpenBSD$ +...@lib lib/libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION} +...@lib lib/libUsageEnvironment.so.${LIBUsageEnvironment_VERSION} +...@lib lib/libgroupsock.so.${LIBgroupsock_VERSION} +...@lib lib/libliveMedia.so.${LIBliveMedia_VERSION} Index: net/livemedia/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/livemedia/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- net/livemedia/pkg/PLIST 15 Jul 2008 16:14:24 -0000 1.3 +++ net/livemedia/pkg/PLIST 27 May 2010 08:32:38 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.3 2008/07/15 16:14:24 brad Exp $ +%%SHARED%% @bin bin/openRTSP @bin bin/playSIP @bin bin/sapWatch Index: x11/vlc/Makefile =================================================================== RCS file: /cvs/ports/x11/vlc/Makefile,v retrieving revision 1.90 diff -u -p -r1.90 Makefile --- x11/vlc/Makefile 16 May 2010 08:37:48 -0000 1.90 +++ x11/vlc/Makefile 27 May 2010 08:33:18 -0000 @@ -6,7 +6,7 @@ COMMENT-main= VideoLAN client; multimedi V= 1.0.6 DISTNAME= vlc-${V} -PKGNAME-main= ${DISTNAME}p1 +PKGNAME-main= ${DISTNAME}p2 CATEGORIES= x11 MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ EXTRACT_SUFX= .tar.bz2 @@ -51,14 +51,15 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \ tag::audio/taglib \ dca::audio/libdca \ proxy::net/libproxy \ - notify::devel/libnotify + notify::devel/libnotify \ + BasicUsageEnvironment,UsageEnvironment,groupsock,liveMedia::net/livemedia RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils WANTLIB-main= GL GLU ICE SM SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ Xext Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86vm atk-1.0 bz2 \ c cairo dbus-glib-1 expat faac fontconfig freetype gdk-x11-2.0 \ gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ - gthread-2.0 gtk-x11-2.0 jpeg m mp3lame oil-0.3 ogg pango-1.0 \ + gsm gthread-2.0 gtk-x11-2.0 jpeg m mp3lame oil-0.3 ogg pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 pthread-stubs pthread \ stdc++.>=46.0 sndio tiff usbhid vorbis vorbisenc xcb-keysyms \ xcb-render xcb-render-util xcb z @@ -82,7 +83,8 @@ CONFIGURE_ARGS+=--disable-altivec \ --disable-libgcrypt \ --disable-libtar \ --disable-libv4l2 \ - --disable-live555 \ + --enable-live555 \ + --with-live555-tree=/usr/local/live/ \ --disable-lua \ --disable-mod \ --disable-mtp \ Index: x11/vlc/patches/patch-src_libvlc_c =================================================================== RCS file: /cvs/ports/x11/vlc/patches/patch-src_libvlc_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_libvlc_c --- x11/vlc/patches/patch-src_libvlc_c 5 May 2010 08:43:35 -0000 1.1 +++ x11/vlc/patches/patch-src_libvlc_c 27 May 2010 08:33:18 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-src_libvlc_c,v 1.1 2010/05/05 08:43:35 edd Exp $ ---- src/libvlc.c.orig Sun Mar 7 13:38:03 2010 -+++ src/libvlc.c Tue Apr 27 19:14:30 2010 +--- src/libvlc.c.orig Sun Mar 7 19:38:03 2010 ++++ src/libvlc.c Wed May 26 16:42:36 2010 @@ -906,21 +906,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i && config_GetInt( p_libvlc, "started-from-file" ) ) ) libvlc_InternalAddIntf( p_libvlc, "dbus,none" ); -+#ifdef __i386__ ++#if 0 /* Prevents the power management daemon from suspending the system * when VLC is active */ if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) @@ -18,7 +18,7 @@ $OpenBSD: patch-src_libvlc_c,v 1.1 2010/ * Currently, only for X */ #ifdef HAVE_X11_XLIB_H -+#ifdef __i386__ ++#if 0 if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { libvlc_InternalAddIntf( p_libvlc, "screensaver,none" ); Index: x11/vlc/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/vlc/pkg/PLIST-main,v retrieving revision 1.10 diff -u -p -r1.10 PLIST-main --- x11/vlc/pkg/PLIST-main 16 May 2010 08:37:48 -0000 1.10 +++ x11/vlc/pkg/PLIST-main 27 May 2010 08:33:19 -0000 @@ -391,6 +391,9 @@ lib/vlc/demux/libflacsys_plugin.so @comment lib/vlc/demux/libh264_plugin.a lib/vlc/demux/libh264_plugin.la lib/vlc/demux/libh264_plugin.so +lib/vlc/demux/liblive555_plugin.a +lib/vlc/demux/liblive555_plugin.la +lib/vlc/demux/liblive555_plugin.so @comment lib/vlc/demux/libm4v_plugin.a lib/vlc/demux/libm4v_plugin.la lib/vlc/demux/libm4v_plugin.so
