RESUBMIT: livemedia & vlc update/fixes

classic Classic list List threaded Threaded
17 messages Options
Reply | Threaded
Open this post in threaded view
|

RESUBMIT: livemedia & vlc update/fixes

David Coppa
Hi,
I'm resubmitting my update/fix for both livemedia and vlc.
I'd like to have this committed so please test it, if you can/care.

mplayer's also happy with livemedia update (tested on my laptop).
livemedia's distfile should be mirrored...

Thanks landry@ for his inputs.

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 7 Jun 2010 12:35:28 -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
+DISTNAME= live.2010.03.08
+PKGNAME= liveMedia-20100308
 CATEGORIES= net devel
-MASTER_SITES= http://comstyle.com/source/
+MASTER_SITES= ftp://ftp.archlinux.org/other/live-media/
 
 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
@@ -30,8 +33,19 @@ NO_REGRESS= Yes
 CFLAGS+= -fPIC
 
 post-extract:
+# garbage files in distfile that mess up 'make update-patches'
+ @mv -f ${WRKSRC}/config.armlinux.orig ${WRKSRC}/config.armlinux
+ @rm -f ${WRKSRC}/config.armlinux.rej
  @cp -f ${FILESDIR}/config.fixed-openbsd ${WRKSRC}/
 
+pre-configure:
+ cd ${WRKSRC}; perl -i -pe 's/(LIBRARY_LINK\))(\S+)/$$1 $$2/' \
+ `find . -type f -name Makefile.tail`
+ ${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 +67,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/distinfo
===================================================================
RCS file: /cvs/ports/net/livemedia/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- net/livemedia/distinfo 15 Apr 2009 08:22:11 -0000 1.7
+++ net/livemedia/distinfo 7 Jun 2010 12:35:28 -0000
@@ -1,5 +1,5 @@
-MD5 (live.2009.04.07.tar.gz) = ck1nea5jY1RdnoOAjlzsLg==
-RMD160 (live.2009.04.07.tar.gz) = TpyGGjx41t2qeeYHI+6r6YVqz/M=
-SHA1 (live.2009.04.07.tar.gz) = IRnWCUGqPXQjTfDzb6ppu5BKdTA=
-SHA256 (live.2009.04.07.tar.gz) = PpHLzaAvnbSMbteFZPIjksJzWD4D0v3VRBf2G6XdY1E=
-SIZE (live.2009.04.07.tar.gz) = 462577
+MD5 (live.2010.03.08.tar.gz) = LGhcAEaVr84GTseA5YQJzA==
+RMD160 (live.2010.03.08.tar.gz) = ox9ONGqNSo6BToyFrrOe5Gmp+pY=
+SHA1 (live.2010.03.08.tar.gz) = 37lKaJ4AYZJZ/72gQDsTK5B+qKc=
+SHA256 (live.2010.03.08.tar.gz) = Ghgde2jiquN/6wNXooN+WYOGrW3MojgOBcYPJgnu8ig=
+SIZE (live.2010.03.08.tar.gz) = 453654
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 7 Jun 2010 12:35:28 -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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- BasicUsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ BasicUsageEnvironment/Makefile.tail Mon May 31 16:34:21 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) \
+@@ -11,6 +12,10 @@ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnviron
+ libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
+ $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+ $(OBJS)
++
++libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION}: $(OBJS)
++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \
++ $(OBJS) -lstdc++
+
+ .$(C).$(OBJ):
+ $(C_COMPILER) -c $(C_FLAGS) $<      
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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- UsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ UsageEnvironment/Makefile.tail Mon May 31 16:34:34 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)
++
++$(USAGE_ENVIRONMENT_LIB_SHARED): $(OBJS)
++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) $(OBJS) -lstdc++
+
+ .$(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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- groupsock/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ groupsock/Makefile.tail Mon May 31 16:34:46 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):
+@@ -29,6 +29,11 @@ libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+ $(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) -lstdc++
+
+ clean:
+ -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- liveMedia/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ liveMedia/Makefile.tail Mon May 31 16:35:16 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):
+@@ -49,6 +50,11 @@ $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+ $(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) -lstdc++
+
+ Media.$(CPP): include/Media.hh
+ include/Media.hh: include/liveMedia_version.hh
Index: net/livemedia/patches/patch-liveMedia_RTSPClient_cpp
===================================================================
RCS file: /cvs/ports/net/livemedia/patches/patch-liveMedia_RTSPClient_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-liveMedia_RTSPClient_cpp
--- net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 15 Apr 2009 08:22:12 -0000 1.2
+++ net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 7 Jun 2010 12:35:28 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-liveMedia_RTSPClient_cpp,v 1.2 2009/04/15 08:22:12 landry Exp $
 Fixes tv-over-ip with my isp (free.fr) using vlc.
---- liveMedia/RTSPClient.cpp.orig Mon Apr  6 22:19:00 2009
-+++ liveMedia/RTSPClient.cpp Thu Apr  9 23:27:06 2009
-@@ -2136,9 +2136,7 @@ unsigned RTSPClient::getResponse1(char*& responseBuffe
+--- liveMedia/RTSPClient.cpp.orig Mon Mar  8 10:52:12 2010
++++ liveMedia/RTSPClient.cpp Mon May 31 13:58:49 2010
+@@ -2122,9 +2122,7 @@ unsigned RTSPClient::getResponse1(char*& responseBuffe
    Boolean success = False;
    while (1) {
      unsigned char firstByte;
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 7 Jun 2010 12:35:28 -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 7 Jun 2010 12:35:29 -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
@@ -53,6 +54,10 @@ live/liveMedia/include/BasicUDPSink.hh
 live/liveMedia/include/BasicUDPSource.hh
 live/liveMedia/include/ByteStreamFileSource.hh
 live/liveMedia/include/ByteStreamMultiFileSource.hh
+live/liveMedia/include/DVVideoFileServerMediaSubsession.hh
+live/liveMedia/include/DVVideoRTPSink.hh
+live/liveMedia/include/DVVideoRTPSource.hh
+live/liveMedia/include/DVVideoStreamFramer.hh
 live/liveMedia/include/DarwinInjector.hh
 live/liveMedia/include/DeviceSource.hh
 live/liveMedia/include/DigestAuthentication.hh
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 7 Jun 2010 12:36:12 -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
@@ -47,11 +47,14 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
  x264::multimedia/x264 \
  schroedinger-1.0::multimedia/schroedinger \
  dvbpsi.>=3::graphics/libdvbpsi \
+ gsm.>=1.0::audio/gsm \
  speex::audio/speex \
  tag::audio/taglib \
+ vorbis.>=6,vorbisenc.>=2::audio/libvorbis \
  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 \
@@ -60,8 +63,8 @@ WANTLIB-main= GL GLU ICE SM SDL X11 Xau
  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 \
  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
+ stdc++.>=46.0 sndio tiff usbhid xcb-keysyms xcb-render \
+ xcb-render-util xcb z
 
 USE_X11= Yes
 USE_GMAKE= Yes
@@ -82,7 +85,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 \
@@ -116,17 +120,25 @@ FLAVOR?=
 .if !${FLAVOR:L:Mno_web}
 MULTI_PACKAGES+=-web
 COMMENT-web= Mozilla plugin for embedded media playback
-PKGNAME-web= vlc-web-${V}
-BUILD_DEPENDS+= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
-CONFIGURE_ARGS+=--enable-mozilla
-CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
- with_mozilla_pkg="xulrunner-plugin"
-PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner
+PKGNAME-web= vlc-web-${V}p0
+BUILD_DEPENDS+= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel
+CONFIGURE_ARGS+=--enable-mozilla --with-mozilla-sdk-path=${LOCALBASE}/xulrunner-1.9
+CONFIGURE_ENV+= CPPFLAGS="-I${WRKSRC}/include -I${X11BASE}/include -I${LOCALBASE}/include \
+  -I${LOCALBASE}/include/libpng \
+  -I${LOCALBASE}/include/nspr \
+  -I${LOCALBASE}/xulrunner1.9/include \
+  -I${LOCALBASE}/xulrunner1.9/include/java \
+  -I${LOCALBASE}/xulrunner1.9/include/plugin -DOPENBSD \
+  -I${LOCALBASE}/xulrunner1.9/include/pref" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
+ LOCALBASE=${LOCALBASE}
+PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
 LIB_DEPENDS-web=${LIB_DEPENDS} \
  vlc,vlccore::${BASE_PKGPATH} \
  nspr4,plc4,plds4::devel/nspr
 RUN_DEPENDS-web=::${BUILD_PKGPATH}
-WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs xcb
+WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs stdc++.>=46.0 xcb
 .endif
 
 .if !${FLAVOR:L:Mno_jack}
@@ -155,6 +167,9 @@ PKG_ARGS+=-Di386=1
 .else
 PKG_ARGS+=-Di386=0
 .endif
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/configure.ac
 
 post-install:
 .for _img in 16x16 32x32 48x48 128x128
Index: x11/vlc/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.16
diff -u -p -r1.16 patch-configure_ac
--- x11/vlc/patches/patch-configure_ac 9 May 2010 00:16:26 -0000 1.16
+++ x11/vlc/patches/patch-configure_ac 7 Jun 2010 12:36:12 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
---- configure.ac.orig Sun Apr 18 09:03:54 2010
-+++ configure.ac Wed May  5 18:37:05 2010
+--- configure.ac.orig Sun Apr 18 15:03:54 2010
++++ configure.ac Mon Jun  7 11:43:18 2010
 @@ -826,6 +826,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
  dnl Check for pthreads - borrowed from XMMS
  THREAD_LIB=error
@@ -11,7 +11,23 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
    AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
  fi
  if test "${THREAD_LIB}" = "error"; then
-@@ -2525,7 +2528,7 @@ then
+@@ -2016,10 +2019,11 @@ lternatively you can use --disable-live555 to disable
+         VLC_ADD_LIBS([live555],[-lws2_32])
+       fi
+
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
++      VLC_ADD_LIBS([live555],[-L/usr/lib -lstdc++])
++      VLC_ADD_LIBS([live555],[-lUsageEnvironment])
++      VLC_ADD_LIBS([live555],[-lBasicUsageEnvironment])
++      VLC_ADD_LIBS([live555],[-lgroupsock])
++      VLC_ADD_LIBS([live555],[-L${LOCALBASE}/lib -lliveMedia])
+
+       VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
+       VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
+@@ -2525,7 +2529,7 @@ then
    fi
 
    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
@@ -20,7 +36,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
      VLC_ADD_PLUGIN([v4l2])
    ],[])
    CPPFLAGS="${CPPFLAGS_save}"
-@@ -3753,14 +3756,14 @@ AC_ARG_ENABLE(png,
+@@ -3753,14 +3757,14 @@ AC_ARG_ENABLE(png,
    [  --enable-png            PNG support (default enabled)])
  if test "${enable_png}" != "no"; then
  AC_CHECK_HEADERS(png.h, [
@@ -38,3 +54,12 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
      LDFLAGS="${LDFLAGS_save}"
    ])
  fi
+@@ -5746,7 +5750,7 @@ then
+     PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+     VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
+     if ${need_xpcom_libs}; then
+-       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
++       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11 -lSM -lICE -lXpm])
+       if test "${SYS}" = "mingw32"; then
+         dnl latest gecko sdk does not have embedstring
+         if test -d "${real_mozilla_sdk}/embedstring/bin"
Index: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
diff -N x11/vlc/patches/patch-projects_mozilla_support_npunix_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_support_npunix_c 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/support/npunix.c.orig Fri May 28 17:15:04 2010
++++ projects/mozilla/support/npunix.c Fri May 28 17:15:45 2010
+@@ -49,10 +49,10 @@
+ #define OJI 1
+
+ #include <npapi.h>
+-#ifdef HAVE_NPFUNCTIONS_H
+-#include <npfunctions.h>
+-#else
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ #include <npupp.h>
++#else
++#include <npfunctions.h>
+ #endif
+
+ #include "../vlcshell.h"
Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.cpp.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcplugin.cpp Mon May 31 12:49:02 2010
+@@ -36,11 +36,12 @@
+ #include "control/npolibvlc.h"
+
+ #include <ctype.h>
++#include <stdlib.h>
+
+ /*****************************************************************************
+  * VlcPlugin constructor and destructor
+  *****************************************************************************/
+-VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
++VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
+     i_npmode(mode),
+     b_stream(0),
+     b_autoplay(1),
Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_h 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.h.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcplugin.h Mon May 31 12:49:02 2010
+@@ -82,7 +82,7 @@ typedef enum vlc_toolbar_clicked_e {
+ class VlcPlugin
+ {
+ public:
+-             VlcPlugin( NPP, uint16 );
++             VlcPlugin( NPP, uint16_t );
+     virtual ~VlcPlugin();
+
+     NPError             init(int argc, char* const argn[], char* const argv[]);
+@@ -135,7 +135,7 @@ class VlcPlugin (public)
+     vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
+ #endif
+
+-    uint16    i_npmode; /* either NP_EMBED or NP_FULL */
++    uint16_t    i_npmode; /* either NP_EMBED or NP_FULL */
+
+     /* plugin properties */
+     int      b_stream;
Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.cpp.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcshell.cpp Mon May 31 12:49:02 2010
+@@ -275,7 +275,7 @@ void NPP_Shutdown( void )
+     ;
+ }
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
+                  char* argn[], char* argv[], NPSavedData* saved )
+ {
+     NPError status;
+@@ -579,7 +579,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window
+ }
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+-                       NPBool seekable, uint16 *stype )
++                       NPBool seekable, uint16_t *stype )
+ {
+     if( NULL == instance  )
+     {
+@@ -608,14 +608,14 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type,
+     return NPERR_GENERIC_ERROR;
+ }
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream )
++int32_t NPP_WriteReady( NPP instance, NPStream *stream )
+ {
+     /* TODO */
+     return 8*1024;
+ }
+
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+-                 int32 len, void *buffer )
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++                 int32_t len, void *buffer )
+ {
+     /* TODO */
+     return len;
Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcshell_h 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.h.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcshell.h Mon May 31 12:49:23 2010
+@@ -30,7 +30,7 @@ NPError NPP_Initialize( void );
+ jref NPP_GetJavaClass( void );
+ void NPP_Shutdown( void );
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
+                  char* argn[], char* argv[], NPSavedData* saved );
+ NPError NPP_Destroy( NPP instance, NPSavedData** save );
+
+@@ -40,20 +40,20 @@ NPError NPP_SetValue( NPP instance, NPNVariable variab
+ NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+-                       NPBool seekable, uint16 *stype );
++                       NPBool seekable, uint16_t *stype );
+ NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
+ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream );
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+-                 int32 len, void *buffer );
++int32_t NPP_WriteReady( NPP instance, NPStream *stream );
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++                 int32_t len, void *buffer );
+
+ void NPP_URLNotify( NPP instance, const char* url,
+                     NPReason reason, void* notifyData );
+ void NPP_Print( NPP instance, NPPrint* printInfo );
+
+ #ifdef XP_MACOSX
+-int16 NPP_HandleEvent( NPP instance, void * event );
++int16_t NPP_HandleEvent( NPP instance, void * event );
+ #endif
+
+ #endif
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 7 Jun 2010 12:36:13 -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 7 Jun 2010 12:36:13 -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

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

David Coppa
This adds a new patch to fix a problem with the
Help->About->Thanks dialog, from ajacoutot@: thanks!

cheers,
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 7 Jun 2010 12:35:28 -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
+DISTNAME= live.2010.03.08
+PKGNAME= liveMedia-20100308
 CATEGORIES= net devel
-MASTER_SITES= http://comstyle.com/source/
+MASTER_SITES= ftp://ftp.archlinux.org/other/live-media/
 
 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
@@ -30,8 +33,19 @@ NO_REGRESS= Yes
 CFLAGS+= -fPIC
 
 post-extract:
+# garbage files in distfile that mess up 'make update-patches'
+ @mv -f ${WRKSRC}/config.armlinux.orig ${WRKSRC}/config.armlinux
+ @rm -f ${WRKSRC}/config.armlinux.rej
  @cp -f ${FILESDIR}/config.fixed-openbsd ${WRKSRC}/
 
+pre-configure:
+ cd ${WRKSRC}; perl -i -pe 's/(LIBRARY_LINK\))(\S+)/$$1 $$2/' \
+ `find . -type f -name Makefile.tail`
+ ${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 +67,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/distinfo
===================================================================
RCS file: /cvs/ports/net/livemedia/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- net/livemedia/distinfo 15 Apr 2009 08:22:11 -0000 1.7
+++ net/livemedia/distinfo 7 Jun 2010 12:35:28 -0000
@@ -1,5 +1,5 @@
-MD5 (live.2009.04.07.tar.gz) = ck1nea5jY1RdnoOAjlzsLg==
-RMD160 (live.2009.04.07.tar.gz) = TpyGGjx41t2qeeYHI+6r6YVqz/M=
-SHA1 (live.2009.04.07.tar.gz) = IRnWCUGqPXQjTfDzb6ppu5BKdTA=
-SHA256 (live.2009.04.07.tar.gz) = PpHLzaAvnbSMbteFZPIjksJzWD4D0v3VRBf2G6XdY1E=
-SIZE (live.2009.04.07.tar.gz) = 462577
+MD5 (live.2010.03.08.tar.gz) = LGhcAEaVr84GTseA5YQJzA==
+RMD160 (live.2010.03.08.tar.gz) = ox9ONGqNSo6BToyFrrOe5Gmp+pY=
+SHA1 (live.2010.03.08.tar.gz) = 37lKaJ4AYZJZ/72gQDsTK5B+qKc=
+SHA256 (live.2010.03.08.tar.gz) = Ghgde2jiquN/6wNXooN+WYOGrW3MojgOBcYPJgnu8ig=
+SIZE (live.2010.03.08.tar.gz) = 453654
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 7 Jun 2010 12:35:28 -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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- BasicUsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ BasicUsageEnvironment/Makefile.tail Mon May 31 16:34:21 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) \
+@@ -11,6 +12,10 @@ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnviron
+ libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
+ $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+ $(OBJS)
++
++libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION}: $(OBJS)
++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \
++ $(OBJS) -lstdc++
+
+ .$(C).$(OBJ):
+ $(C_COMPILER) -c $(C_FLAGS) $<      
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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- UsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ UsageEnvironment/Makefile.tail Mon May 31 16:34:34 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)
++
++$(USAGE_ENVIRONMENT_LIB_SHARED): $(OBJS)
++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) $(OBJS) -lstdc++
+
+ .$(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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- groupsock/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ groupsock/Makefile.tail Mon May 31 16:34:46 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):
+@@ -29,6 +29,11 @@ libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+ $(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) -lstdc++
+
+ clean:
+ -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
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 7 Jun 2010 12:35:28 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- liveMedia/Makefile.tail.orig Mon Mar  8 10:52:12 2010
++++ liveMedia/Makefile.tail Mon May 31 16:35:16 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):
+@@ -49,6 +50,11 @@ $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+ $(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) -lstdc++
+
+ Media.$(CPP): include/Media.hh
+ include/Media.hh: include/liveMedia_version.hh
Index: net/livemedia/patches/patch-liveMedia_RTSPClient_cpp
===================================================================
RCS file: /cvs/ports/net/livemedia/patches/patch-liveMedia_RTSPClient_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-liveMedia_RTSPClient_cpp
--- net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 15 Apr 2009 08:22:12 -0000 1.2
+++ net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 7 Jun 2010 12:35:28 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-liveMedia_RTSPClient_cpp,v 1.2 2009/04/15 08:22:12 landry Exp $
 Fixes tv-over-ip with my isp (free.fr) using vlc.
---- liveMedia/RTSPClient.cpp.orig Mon Apr  6 22:19:00 2009
-+++ liveMedia/RTSPClient.cpp Thu Apr  9 23:27:06 2009
-@@ -2136,9 +2136,7 @@ unsigned RTSPClient::getResponse1(char*& responseBuffe
+--- liveMedia/RTSPClient.cpp.orig Mon Mar  8 10:52:12 2010
++++ liveMedia/RTSPClient.cpp Mon May 31 13:58:49 2010
+@@ -2122,9 +2122,7 @@ unsigned RTSPClient::getResponse1(char*& responseBuffe
    Boolean success = False;
    while (1) {
      unsigned char firstByte;
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 7 Jun 2010 12:35:28 -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 7 Jun 2010 12:35:29 -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
@@ -53,6 +54,10 @@ live/liveMedia/include/BasicUDPSink.hh
 live/liveMedia/include/BasicUDPSource.hh
 live/liveMedia/include/ByteStreamFileSource.hh
 live/liveMedia/include/ByteStreamMultiFileSource.hh
+live/liveMedia/include/DVVideoFileServerMediaSubsession.hh
+live/liveMedia/include/DVVideoRTPSink.hh
+live/liveMedia/include/DVVideoRTPSource.hh
+live/liveMedia/include/DVVideoStreamFramer.hh
 live/liveMedia/include/DarwinInjector.hh
 live/liveMedia/include/DeviceSource.hh
 live/liveMedia/include/DigestAuthentication.hh
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 7 Jun 2010 12:36:12 -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
@@ -47,11 +47,14 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
  x264::multimedia/x264 \
  schroedinger-1.0::multimedia/schroedinger \
  dvbpsi.>=3::graphics/libdvbpsi \
+ gsm.>=1.0::audio/gsm \
  speex::audio/speex \
  tag::audio/taglib \
+ vorbis.>=6,vorbisenc.>=2::audio/libvorbis \
  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 \
@@ -60,8 +63,8 @@ WANTLIB-main= GL GLU ICE SM SDL X11 Xau
  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 \
  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
+ stdc++.>=46.0 sndio tiff usbhid xcb-keysyms xcb-render \
+ xcb-render-util xcb z
 
 USE_X11= Yes
 USE_GMAKE= Yes
@@ -82,7 +85,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 \
@@ -116,17 +120,25 @@ FLAVOR?=
 .if !${FLAVOR:L:Mno_web}
 MULTI_PACKAGES+=-web
 COMMENT-web= Mozilla plugin for embedded media playback
-PKGNAME-web= vlc-web-${V}
-BUILD_DEPENDS+= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
-CONFIGURE_ARGS+=--enable-mozilla
-CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
- with_mozilla_pkg="xulrunner-plugin"
-PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner
+PKGNAME-web= vlc-web-${V}p0
+BUILD_DEPENDS+= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel
+CONFIGURE_ARGS+=--enable-mozilla --with-mozilla-sdk-path=${LOCALBASE}/xulrunner-1.9
+CONFIGURE_ENV+= CPPFLAGS="-I${WRKSRC}/include -I${X11BASE}/include -I${LOCALBASE}/include \
+  -I${LOCALBASE}/include/libpng \
+  -I${LOCALBASE}/include/nspr \
+  -I${LOCALBASE}/xulrunner1.9/include \
+  -I${LOCALBASE}/xulrunner1.9/include/java \
+  -I${LOCALBASE}/xulrunner1.9/include/plugin -DOPENBSD \
+  -I${LOCALBASE}/xulrunner1.9/include/pref" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
+ LOCALBASE=${LOCALBASE}
+PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
 LIB_DEPENDS-web=${LIB_DEPENDS} \
  vlc,vlccore::${BASE_PKGPATH} \
  nspr4,plc4,plds4::devel/nspr
 RUN_DEPENDS-web=::${BUILD_PKGPATH}
-WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs xcb
+WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs stdc++.>=46.0 xcb
 .endif
 
 .if !${FLAVOR:L:Mno_jack}
@@ -155,6 +167,9 @@ PKG_ARGS+=-Di386=1
 .else
 PKG_ARGS+=-Di386=0
 .endif
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/configure.ac
 
 post-install:
 .for _img in 16x16 32x32 48x48 128x128
Index: x11/vlc/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.16
diff -u -p -r1.16 patch-configure_ac
--- x11/vlc/patches/patch-configure_ac 9 May 2010 00:16:26 -0000 1.16
+++ x11/vlc/patches/patch-configure_ac 7 Jun 2010 12:36:12 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
---- configure.ac.orig Sun Apr 18 09:03:54 2010
-+++ configure.ac Wed May  5 18:37:05 2010
+--- configure.ac.orig Sun Apr 18 15:03:54 2010
++++ configure.ac Mon Jun  7 11:43:18 2010
 @@ -826,6 +826,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
  dnl Check for pthreads - borrowed from XMMS
  THREAD_LIB=error
@@ -11,7 +11,23 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
    AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
  fi
  if test "${THREAD_LIB}" = "error"; then
-@@ -2525,7 +2528,7 @@ then
+@@ -2016,10 +2019,11 @@ lternatively you can use --disable-live555 to disable
+         VLC_ADD_LIBS([live555],[-lws2_32])
+       fi
+
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
+-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
++      VLC_ADD_LIBS([live555],[-L/usr/lib -lstdc++])
++      VLC_ADD_LIBS([live555],[-lUsageEnvironment])
++      VLC_ADD_LIBS([live555],[-lBasicUsageEnvironment])
++      VLC_ADD_LIBS([live555],[-lgroupsock])
++      VLC_ADD_LIBS([live555],[-L${LOCALBASE}/lib -lliveMedia])
+
+       VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
+       VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
+@@ -2525,7 +2529,7 @@ then
    fi
 
    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
@@ -20,7 +36,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
      VLC_ADD_PLUGIN([v4l2])
    ],[])
    CPPFLAGS="${CPPFLAGS_save}"
-@@ -3753,14 +3756,14 @@ AC_ARG_ENABLE(png,
+@@ -3753,14 +3757,14 @@ AC_ARG_ENABLE(png,
    [  --enable-png            PNG support (default enabled)])
  if test "${enable_png}" != "no"; then
  AC_CHECK_HEADERS(png.h, [
@@ -38,3 +54,12 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
      LDFLAGS="${LDFLAGS_save}"
    ])
  fi
+@@ -5746,7 +5750,7 @@ then
+     PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+     VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
+     if ${need_xpcom_libs}; then
+-       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
++       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11 -lSM -lICE -lXpm])
+       if test "${SYS}" = "mingw32"; then
+         dnl latest gecko sdk does not have embedstring
+         if test -d "${real_mozilla_sdk}/embedstring/bin"
Index: x11/vlc/patches/patch-src_Makefile_in
===================================================================
RCS file: x11/vlc/patches/patch-src_Makefile_in
diff -N x11/vlc/patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-src_Makefile_in 7 Jun 2010 16:07:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig Mon Jun  7 11:22:23 2010
++++ src/Makefile.in Mon Jun  7 11:22:30 2010
+@@ -3609,7 +3609,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgco
+ cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+ echo ";" >> "$@.tmp"
+ echo "static const char psz_thanks[] =" >> "$@.tmp"
+- grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
++ grep -av '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
+ echo ";" >> "$@.tmp"
+ echo "static const char psz_authors[] =" >> "$@.tmp"
+ grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
Index: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
diff -N x11/vlc/patches/patch-projects_mozilla_support_npunix_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_support_npunix_c 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/support/npunix.c.orig Fri May 28 17:15:04 2010
++++ projects/mozilla/support/npunix.c Fri May 28 17:15:45 2010
+@@ -49,10 +49,10 @@
+ #define OJI 1
+
+ #include <npapi.h>
+-#ifdef HAVE_NPFUNCTIONS_H
+-#include <npfunctions.h>
+-#else
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ #include <npupp.h>
++#else
++#include <npfunctions.h>
+ #endif
+
+ #include "../vlcshell.h"
Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.cpp.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcplugin.cpp Mon May 31 12:49:02 2010
+@@ -36,11 +36,12 @@
+ #include "control/npolibvlc.h"
+
+ #include <ctype.h>
++#include <stdlib.h>
+
+ /*****************************************************************************
+  * VlcPlugin constructor and destructor
+  *****************************************************************************/
+-VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
++VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
+     i_npmode(mode),
+     b_stream(0),
+     b_autoplay(1),
Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_h 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.h.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcplugin.h Mon May 31 12:49:02 2010
+@@ -82,7 +82,7 @@ typedef enum vlc_toolbar_clicked_e {
+ class VlcPlugin
+ {
+ public:
+-             VlcPlugin( NPP, uint16 );
++             VlcPlugin( NPP, uint16_t );
+     virtual ~VlcPlugin();
+
+     NPError             init(int argc, char* const argn[], char* const argv[]);
+@@ -135,7 +135,7 @@ class VlcPlugin (public)
+     vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
+ #endif
+
+-    uint16    i_npmode; /* either NP_EMBED or NP_FULL */
++    uint16_t    i_npmode; /* either NP_EMBED or NP_FULL */
+
+     /* plugin properties */
+     int      b_stream;
Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.cpp.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcshell.cpp Mon May 31 12:49:02 2010
+@@ -275,7 +275,7 @@ void NPP_Shutdown( void )
+     ;
+ }
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
+                  char* argn[], char* argv[], NPSavedData* saved )
+ {
+     NPError status;
+@@ -579,7 +579,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window
+ }
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+-                       NPBool seekable, uint16 *stype )
++                       NPBool seekable, uint16_t *stype )
+ {
+     if( NULL == instance  )
+     {
+@@ -608,14 +608,14 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type,
+     return NPERR_GENERIC_ERROR;
+ }
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream )
++int32_t NPP_WriteReady( NPP instance, NPStream *stream )
+ {
+     /* TODO */
+     return 8*1024;
+ }
+
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+-                 int32 len, void *buffer )
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++                 int32_t len, void *buffer )
+ {
+     /* TODO */
+     return len;
Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
===================================================================
RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/vlc/patches/patch-projects_mozilla_vlcshell_h 7 Jun 2010 12:36:13 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.h.orig Sun Mar  7 19:38:03 2010
++++ projects/mozilla/vlcshell.h Mon May 31 12:49:23 2010
+@@ -30,7 +30,7 @@ NPError NPP_Initialize( void );
+ jref NPP_GetJavaClass( void );
+ void NPP_Shutdown( void );
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
+                  char* argn[], char* argv[], NPSavedData* saved );
+ NPError NPP_Destroy( NPP instance, NPSavedData** save );
+
+@@ -40,20 +40,20 @@ NPError NPP_SetValue( NPP instance, NPNVariable variab
+ NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+-                       NPBool seekable, uint16 *stype );
++                       NPBool seekable, uint16_t *stype );
+ NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
+ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream );
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+-                 int32 len, void *buffer );
++int32_t NPP_WriteReady( NPP instance, NPStream *stream );
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++                 int32_t len, void *buffer );
+
+ void NPP_URLNotify( NPP instance, const char* url,
+                     NPReason reason, void* notifyData );
+ void NPP_Print( NPP instance, NPPrint* printInfo );
+
+ #ifdef XP_MACOSX
+-int16 NPP_HandleEvent( NPP instance, void * event );
++int16_t NPP_HandleEvent( NPP instance, void * event );
+ #endif
+
+ #endif
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 7 Jun 2010 12:36:13 -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 7 Jun 2010 12:36:13 -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

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Brad Smith-14
In reply to this post by David Coppa
On Monday 07 June 2010 08:54:18 David Coppa wrote:
> Hi,
> I'm resubmitting my update/fix for both livemedia and vlc.
> I'd like to have this committed so please test it, if you can/care.

I want the changes separated back out to the separate functional
changes as you had sent me before. There are various things that
need fixing in the various ports you've touched with this combined
diff of a few different changes. I'm Ok with you commiting just the
patch-src_libvlc_c update and a bump for VLC. Then send me the
VLC bits to update xulrunner and I'll look at it. The live555 bits were
the roughest part.

> mplayer's also happy with livemedia update (tested on my laptop).
> livemedia's distfile should be mirrored...

I'll mirror it.

> Thanks landry@ for his inputs.
>
> 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 7 Jun 2010 12:35:28 -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
> +DISTNAME= live.2010.03.08
> +PKGNAME= liveMedia-20100308
>  CATEGORIES= net devel
> -MASTER_SITES= http://comstyle.com/source/
> +MASTER_SITES= ftp://ftp.archlinux.org/other/live-media/
>
>  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
> @@ -30,8 +33,19 @@ NO_REGRESS= Yes
>  CFLAGS+= -fPIC
>
>  post-extract:
> +# garbage files in distfile that mess up 'make update-patches'
> + @mv -f ${WRKSRC}/config.armlinux.orig ${WRKSRC}/config.armlinux
> + @rm -f ${WRKSRC}/config.armlinux.rej
>   @cp -f ${FILESDIR}/config.fixed-openbsd ${WRKSRC}/
>
> +pre-configure:
> + cd ${WRKSRC}; perl -i -pe 's/(LIBRARY_LINK\))(\S+)/$$1 $$2/' \
> + `find . -type f -name Makefile.tail`
> + ${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 +67,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/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/livemedia/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- net/livemedia/distinfo 15 Apr 2009 08:22:11 -0000 1.7
> +++ net/livemedia/distinfo 7 Jun 2010 12:35:28 -0000
> @@ -1,5 +1,5 @@
> -MD5 (live.2009.04.07.tar.gz) = ck1nea5jY1RdnoOAjlzsLg==
> -RMD160 (live.2009.04.07.tar.gz) = TpyGGjx41t2qeeYHI+6r6YVqz/M=
> -SHA1 (live.2009.04.07.tar.gz) = IRnWCUGqPXQjTfDzb6ppu5BKdTA=
> -SHA256 (live.2009.04.07.tar.gz) =
> PpHLzaAvnbSMbteFZPIjksJzWD4D0v3VRBf2G6XdY1E= -SIZE (live.2009.04.07.tar.gz)
> = 462577
> +MD5 (live.2010.03.08.tar.gz) = LGhcAEaVr84GTseA5YQJzA==
> +RMD160 (live.2010.03.08.tar.gz) = ox9ONGqNSo6BToyFrrOe5Gmp+pY=
> +SHA1 (live.2010.03.08.tar.gz) = 37lKaJ4AYZJZ/72gQDsTK5B+qKc=
> +SHA256 (live.2010.03.08.tar.gz) =
> Ghgde2jiquN/6wNXooN+WYOGrW3MojgOBcYPJgnu8ig= +SIZE (live.2010.03.08.tar.gz)
> = 453654
> 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 7 Jun 2010
> 12:35:28 -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 7 Jun
> 2010 12:35:28 -0000 @@ -0,0 +1,24 @@
> +$OpenBSD$
> +--- BasicUsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
> ++++ BasicUsageEnvironment/Makefile.tail Mon May 31 16:34:21 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) \
> +@@ -11,6 +12,10 @@ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnviron
> + libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
> + $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
> + $(OBJS)
> ++
> ++libBasicUsageEnvironment.so.${LIBBasicUsageEnvironment_VERSION}: $(OBJS)
> ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) \
> ++ $(OBJS) -lstdc++
> +
> + .$(C).$(OBJ):
> + $(C_COMPILER) -c $(C_FLAGS) $<
> 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 7 Jun 2010
> 12:35:28 -0000 @@ -0,0 +1,22 @@
> +$OpenBSD$
> +--- UsageEnvironment/Makefile.tail.orig Mon Mar  8 10:52:12 2010
> ++++ UsageEnvironment/Makefile.tail Mon May 31 16:34:34 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)
> ++
> ++$(USAGE_ENVIRONMENT_LIB_SHARED): $(OBJS)
> ++ $(LIBRARY_LINK_SHARED) $@ $(LIBRARY_LINK_OPTS_SHARED) $(OBJS) -lstdc++
> +
> + .$(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 7 Jun 2010 12:35:28
> -0000 @@ -0,0 +1,23 @@
> +$OpenBSD$
> +--- groupsock/Makefile.tail.orig Mon Mar  8 10:52:12 2010
> ++++ groupsock/Makefile.tail Mon May 31 16:34:46 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):
> +@@ -29,6 +29,11 @@ libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
> +     $(PLATFORM_SPECIFIC_LIB_OBJS)
> + $(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) -lstdc++
> +
> + clean:
> + -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
> 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 7 Jun 2010 12:35:28
> -0000 @@ -0,0 +1,25 @@
> +$OpenBSD$
> +--- liveMedia/Makefile.tail.orig Mon Mar  8 10:52:12 2010
> ++++ liveMedia/Makefile.tail Mon May 31 16:35:16 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):
> +@@ -49,6 +50,11 @@ $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
> +     $(PLATFORM_SPECIFIC_LIB_OBJS)
> + $(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) -lstdc++
> +
> + Media.$(CPP): include/Media.hh
> + include/Media.hh: include/liveMedia_version.hh
> Index: net/livemedia/patches/patch-liveMedia_RTSPClient_cpp
> ===================================================================
> RCS file: /cvs/ports/net/livemedia/patches/patch-liveMedia_RTSPClient_cpp,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-liveMedia_RTSPClient_cpp
> --- net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 15 Apr 2009
> 08:22:12 -0000 1.2 +++
> net/livemedia/patches/patch-liveMedia_RTSPClient_cpp 7 Jun 2010 12:35:28
> -0000 @@ -1,8 +1,8 @@
>  $OpenBSD: patch-liveMedia_RTSPClient_cpp,v 1.2 2009/04/15 08:22:12 landry
> Exp $ Fixes tv-over-ip with my isp (free.fr) using vlc.
> ---- liveMedia/RTSPClient.cpp.orig Mon Apr  6 22:19:00 2009
> -+++ liveMedia/RTSPClient.cpp Thu Apr  9 23:27:06 2009
> -@@ -2136,9 +2136,7 @@ unsigned RTSPClient::getResponse1(char*&
> responseBuffe +--- liveMedia/RTSPClient.cpp.orig Mon Mar  8 10:52:12 2010
> ++++ liveMedia/RTSPClient.cpp Mon May 31 13:58:49 2010
> +@@ -2122,9 +2122,7 @@ unsigned RTSPClient::getResponse1(char*&
> responseBuffe Boolean success = False;
>     while (1) {
>       unsigned char firstByte;
> 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 7 Jun 2010 12:35:28 -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 7 Jun 2010 12:35:29 -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
> @@ -53,6 +54,10 @@ live/liveMedia/include/BasicUDPSink.hh
>  live/liveMedia/include/BasicUDPSource.hh
>  live/liveMedia/include/ByteStreamFileSource.hh
>  live/liveMedia/include/ByteStreamMultiFileSource.hh
> +live/liveMedia/include/DVVideoFileServerMediaSubsession.hh
> +live/liveMedia/include/DVVideoRTPSink.hh
> +live/liveMedia/include/DVVideoRTPSource.hh
> +live/liveMedia/include/DVVideoStreamFramer.hh
>  live/liveMedia/include/DarwinInjector.hh
>  live/liveMedia/include/DeviceSource.hh
>  live/liveMedia/include/DigestAuthentication.hh
> 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 7 Jun 2010 12:36:12 -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
> @@ -47,11 +47,14 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
>   x264::multimedia/x264 \
>   schroedinger-1.0::multimedia/schroedinger \
>   dvbpsi.>=3::graphics/libdvbpsi \
> + gsm.>=1.0::audio/gsm \
>   speex::audio/speex \
>   tag::audio/taglib \
> + vorbis.>=6,vorbisenc.>=2::audio/libvorbis \
>   dca::audio/libdca \
>   proxy::net/libproxy \
> - notify::devel/libnotify
> + notify::devel/libnotify \
> + BasicUsageEnvironment,UsageEnvironment,groupsock,liveMedia::net/livemedi
>a RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
>
>  WANTLIB-main= GL GLU ICE SM SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
> @@ -60,8 +63,8 @@ WANTLIB-main= GL GLU ICE SM SDL X11 Xau
>   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 \
>   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
> + stdc++.>=46.0 sndio tiff usbhid xcb-keysyms xcb-render \
> + xcb-render-util xcb z
>
>  USE_X11= Yes
>  USE_GMAKE= Yes
> @@ -82,7 +85,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 \
> @@ -116,17 +120,25 @@ FLAVOR?=
>  .if !${FLAVOR:L:Mno_web}
>  MULTI_PACKAGES+=-web
>  COMMENT-web= Mozilla plugin for embedded media playback
> -PKGNAME-web= vlc-web-${V}
> -BUILD_DEPENDS+= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
> -CONFIGURE_ARGS+=--enable-mozilla
> -CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
> - with_mozilla_pkg="xulrunner-plugin"
> -PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOC
>ALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner
> +PKGNAME-web= vlc-web-${V}p0
> +BUILD_DEPENDS+= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel
> +CONFIGURE_ARGS+=--enable-mozilla
> --with-mozilla-sdk-path=${LOCALBASE}/xulrunner-1.9
> +CONFIGURE_ENV+= CPPFLAGS="-I${WRKSRC}/include -I${X11BASE}/include
> -I${LOCALBASE}/include \ +  -I${LOCALBASE}/include/libpng \
> +  -I${LOCALBASE}/include/nspr \
> +  -I${LOCALBASE}/xulrunner1.9/include \
> +  -I${LOCALBASE}/xulrunner1.9/include/java \
> +  -I${LOCALBASE}/xulrunner1.9/include/plugin -DOPENBSD \
> +  -I${LOCALBASE}/xulrunner1.9/include/pref" \
> + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
> + PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
> + LOCALBASE=${LOCALBASE}
> +PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOC
>ALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
> LIB_DEPENDS-web=${LIB_DEPENDS} \
>   vlc,vlccore::${BASE_PKGPATH} \
>   nspr4,plc4,plds4::devel/nspr
>  RUN_DEPENDS-web=::${BUILD_PKGPATH}
> -WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs xcb
> +WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs stdc++.>=46.0 xcb
>  .endif
>
>  .if !${FLAVOR:L:Mno_jack}
> @@ -155,6 +167,9 @@ PKG_ARGS+=-Di386=1
>  .else
>  PKG_ARGS+=-Di386=0
>  .endif
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/configure.ac
>
>  post-install:
>  .for _img in 16x16 32x32 48x48 128x128
> Index: x11/vlc/patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-configure_ac
> --- x11/vlc/patches/patch-configure_ac 9 May 2010 00:16:26 -0000 1.16
> +++ x11/vlc/patches/patch-configure_ac 7 Jun 2010 12:36:12 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
> ---- configure.ac.orig Sun Apr 18 09:03:54 2010
> -+++ configure.ac Wed May  5 18:37:05 2010
> +--- configure.ac.orig Sun Apr 18 15:03:54 2010
> ++++ configure.ac Mon Jun  7 11:43:18 2010
>  @@ -826,6 +826,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
>   dnl Check for pthreads - borrowed from XMMS
>   THREAD_LIB=error
> @@ -11,7 +11,23 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
>     AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
>   fi
>   if test "${THREAD_LIB}" = "error"; then
> -@@ -2525,7 +2528,7 @@ then
> +@@ -2016,10 +2019,11 @@ lternatively you can use --disable-live555 to
> disable +         VLC_ADD_LIBS([live555],[-lws2_32])
> +       fi
> +
> +-      VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment
> -lUsageEnvironment]) +-    
> VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment
> -lBasicUsageEnvironment]) +-    
> VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock]) +-  
>    VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
> ++      VLC_ADD_LIBS([live555],[-L/usr/lib -lstdc++])
> ++      VLC_ADD_LIBS([live555],[-lUsageEnvironment])
> ++      VLC_ADD_LIBS([live555],[-lBasicUsageEnvironment])
> ++      VLC_ADD_LIBS([live555],[-lgroupsock])
> ++      VLC_ADD_LIBS([live555],[-L${LOCALBASE}/lib -lliveMedia])
> +
> +      
> VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/in
>clude]) +      
> VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include]) +@@
> -2525,7 +2529,7 @@ then
>     fi
>
>     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
> @@ -20,7 +36,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
>       VLC_ADD_PLUGIN([v4l2])
>     ],[])
>     CPPFLAGS="${CPPFLAGS_save}"
> -@@ -3753,14 +3756,14 @@ AC_ARG_ENABLE(png,
> +@@ -3753,14 +3757,14 @@ AC_ARG_ENABLE(png,
>     [  --enable-png            PNG support (default enabled)])
>   if test "${enable_png}" != "no"; then
>   AC_CHECK_HEADERS(png.h, [
> @@ -38,3 +54,12 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
>       LDFLAGS="${LDFLAGS_save}"
>     ])
>   fi
> +@@ -5746,7 +5750,7 @@ then
> +     PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
> +     VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE
> -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}
> -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include
> -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include
> -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include
> -I${real_mozilla_sdk}/java/include]) +     if ${need_xpcom_libs}; then
> +-       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin
> -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin
> -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4
> -lplc4 -lxpcomglue]) ++      
> VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin
> -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin
> -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4
> -lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11
> -lSM -lICE -lXpm]) +       if test "${SYS}" = "mingw32"; then
> +         dnl latest gecko sdk does not have embedstring
> +         if test -d "${real_mozilla_sdk}/embedstring/bin"
> Index: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
> ===================================================================
> RCS file: x11/vlc/patches/patch-projects_mozilla_support_npunix_c
> diff -N x11/vlc/patches/patch-projects_mozilla_support_npunix_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/vlc/patches/patch-projects_mozilla_support_npunix_c 7 Jun 2010
> 12:36:13 -0000 @@ -0,0 +1,17 @@
> +$OpenBSD$
> +--- projects/mozilla/support/npunix.c.orig Fri May 28 17:15:04 2010
> ++++ projects/mozilla/support/npunix.c Fri May 28 17:15:45 2010
> +@@ -49,10 +49,10 @@
> + #define OJI 1
> +
> + #include <npapi.h>
> +-#ifdef HAVE_NPFUNCTIONS_H
> +-#include <npfunctions.h>
> +-#else
> ++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
> + #include <npupp.h>
> ++#else
> ++#include <npfunctions.h>
> + #endif
> +
> + #include "../vlcshell.h"
> Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
> ===================================================================
> RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
> diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp 7 Jun 2010
> 12:36:13 -0000 @@ -0,0 +1,17 @@
> +$OpenBSD$
> +--- projects/mozilla/vlcplugin.cpp.orig Sun Mar  7 19:38:03 2010
> ++++ projects/mozilla/vlcplugin.cpp Mon May 31 12:49:02 2010
> +@@ -36,11 +36,12 @@
> + #include "control/npolibvlc.h"
> +
> + #include <ctype.h>
> ++#include <stdlib.h>
> +
> +
> /**************************************************************************
>*** +  * VlcPlugin constructor and destructor
> +
> ***************************************************************************
>**/ +-VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
> ++VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
> +     i_npmode(mode),
> +     b_stream(0),
> +     b_autoplay(1),
> Index: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
> ===================================================================
> RCS file: x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
> diff -N x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/vlc/patches/patch-projects_mozilla_vlcplugin_h 7 Jun 2010 12:36:13
> -0000 @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- projects/mozilla/vlcplugin.h.orig Sun Mar  7 19:38:03 2010
> ++++ projects/mozilla/vlcplugin.h Mon May 31 12:49:02 2010
> +@@ -82,7 +82,7 @@ typedef enum vlc_toolbar_clicked_e {
> + class VlcPlugin
> + {
> + public:
> +-             VlcPlugin( NPP, uint16 );
> ++             VlcPlugin( NPP, uint16_t );
> +     virtual ~VlcPlugin();
> +
> +     NPError             init(int argc, char* const argn[], char* const
> argv[]); +@@ -135,7 +135,7 @@ class VlcPlugin (public)
> +     vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos
> ); + #endif
> +
> +-    uint16    i_npmode; /* either NP_EMBED or NP_FULL */
> ++    uint16_t    i_npmode; /* either NP_EMBED or NP_FULL */
> +
> +     /* plugin properties */
> +     int      b_stream;
> Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
> ===================================================================
> RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
> diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp 7 Jun 2010 12:36:13
> -0000 @@ -0,0 +1,39 @@
> +$OpenBSD$
> +--- projects/mozilla/vlcshell.cpp.orig Sun Mar  7 19:38:03 2010
> ++++ projects/mozilla/vlcshell.cpp Mon May 31 12:49:02 2010
> +@@ -275,7 +275,7 @@ void NPP_Shutdown( void )
> +     ;
> + }
> +
> +-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16
> argc, ++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t
> mode, int16_t argc, +                  char* argn[], char* argv[],
> NPSavedData* saved ) + {
> +     NPError status;
> +@@ -579,7 +579,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window
> + }
> +
> + NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
> +-                       NPBool seekable, uint16 *stype )
> ++                       NPBool seekable, uint16_t *stype )
> + {
> +     if( NULL == instance  )
> +     {
> +@@ -608,14 +608,14 @@ NPError NPP_NewStream( NPP instance, NPMIMEType
> type, +     return NPERR_GENERIC_ERROR;
> + }
> +
> +-int32 NPP_WriteReady( NPP instance, NPStream *stream )
> ++int32_t NPP_WriteReady( NPP instance, NPStream *stream )
> + {
> +     /* TODO */
> +     return 8*1024;
> + }
> +
> +-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
> +-                 int32 len, void *buffer )
> ++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
> ++                 int32_t len, void *buffer )
> + {
> +     /* TODO */
> +     return len;
> Index: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
> ===================================================================
> RCS file: x11/vlc/patches/patch-projects_mozilla_vlcshell_h
> diff -N x11/vlc/patches/patch-projects_mozilla_vlcshell_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/vlc/patches/patch-projects_mozilla_vlcshell_h 7 Jun 2010 12:36:13
> -0000 @@ -0,0 +1,38 @@
> +$OpenBSD$
> +--- projects/mozilla/vlcshell.h.orig Sun Mar  7 19:38:03 2010
> ++++ projects/mozilla/vlcshell.h Mon May 31 12:49:23 2010
> +@@ -30,7 +30,7 @@ NPError NPP_Initialize( void );
> + jref NPP_GetJavaClass( void );
> + void NPP_Shutdown( void );
> +
> +-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16
> argc, ++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t
> mode, int16_t argc, +                  char* argn[], char* argv[],
> NPSavedData* saved ); + NPError NPP_Destroy( NPP instance, NPSavedData**
> save );
> +
> +@@ -40,20 +40,20 @@ NPError NPP_SetValue( NPP instance, NPNVariable variab
> + NPError NPP_SetWindow( NPP instance, NPWindow* window );
> +
> + NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
> +-                       NPBool seekable, uint16 *stype );
> ++                       NPBool seekable, uint16_t *stype );
> + NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason
> ); + void NPP_StreamAsFile( NPP instance, NPStream *stream, const char*
> fname ); +
> +-int32 NPP_WriteReady( NPP instance, NPStream *stream );
> +-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
> +-                 int32 len, void *buffer );
> ++int32_t NPP_WriteReady( NPP instance, NPStream *stream );
> ++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
> ++                 int32_t len, void *buffer );
> +
> + void NPP_URLNotify( NPP instance, const char* url,
> +                     NPReason reason, void* notifyData );
> + void NPP_Print( NPP instance, NPPrint* printInfo );
> +
> + #ifdef XP_MACOSX
> +-int16 NPP_HandleEvent( NPP instance, void * event );
> ++int16_t NPP_HandleEvent( NPP instance, void * event );
> + #endif
> +
> + #endif
> 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 7 Jun 2010 12:36:13 -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 7 Jun 2010 12:36:13 -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



--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Landry Breuil-5
On Sat, Jun 12, 2010 at 09:22:42PM -0400, Brad wrote:

> On Monday 07 June 2010 08:54:18 David Coppa wrote:
> > Hi,
> > I'm resubmitting my update/fix for both livemedia and vlc.
> > I'd like to have this committed so please test it, if you can/care.
>
> I want the changes separated back out to the separate functional
> changes as you had sent me before. There are various things that
> need fixing in the various ports you've touched with this combined
> diff of a few different changes. I'm Ok with you commiting just the
> patch-src_libvlc_c update and a bump for VLC. Then send me the
> VLC bits to update xulrunner and I'll look at it. The live555 bits were
> the roughest part.

Can we please really move on this part ? David worked on it a lot, the
diff is around since ages, and this part of vlc has been broken since the
update. Antoine and I already looked at it, and i don't really see the
problem with commiting the xulrunner switch AND the livemedia fix
altogether with the types fixes. But if you want separate diffs, so be
it, but let's move on.

Landry

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

David Coppa
In reply to this post by Brad Smith-14
On Sun, Jun 13, 2010 at 3:22 AM, Brad <[hidden email]> wrote:

> I want the changes separated back out to the separate functional
> changes as you had sent me before. There are various things that
> need fixing in the various ports you've touched with this combined
> diff of a few different changes. I'm Ok with you commiting just the
> patch-src_libvlc_c update and a bump for VLC. Then send me the
> VLC bits to update xulrunner and I'll look at it. The live555 bits were
> the roughest part.

You find them attached to this.

One patch for livemedia, one for vlc with just the xul related changes
and one combined: I hope it will be sufficient.

cheers,
david

livemedia.diff (14K) Download Attachment
vlc-xul.diff (67K) Download Attachment
vlc-combined.diff (70K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Edd Barrett
In reply to this post by David Coppa
On Mon, Jun 07, 2010 at 02:54:18PM +0200, David Coppa wrote:
> Hi,
> I'm resubmitting my update/fix for both livemedia and vlc.
> I'd like to have this committed so please test it, if you can/care.
>
> mplayer's also happy with livemedia update (tested on my laptop).
> livemedia's distfile should be mirrored...

VLC seems broken on sparc64, but it seems it may have been broken for some time,
given that there are no packages on the FTP servers:

===> x11/mplayer
===> x11/vlc
`/usr/ports/pobj/vlc-1.0.6/fake-sparc64/.fake_done' is up to date.
===>  Building package for vlc-1.0.6p2
Create /usr/ports/packages/sparc64/all/vlc-1.0.6p2.tgz
reading plist...
checksummingError: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/access/libv4l2_plugin.la does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/access/libv4l2_plugin.so does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.a does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.la does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.so does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/misc/libnotify_plugin.la does not exist
Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/misc/libnotify_plugin.so does not exist

===>  Cleaning for vlc-1.0.6p2
rm -f /usr/ports/packages/sparc64/all/vlc-1.0.6p2.tgz /usr/ports/packages/sparc64/ftp/vlc-1.0.6p2.tgz
*** Error code 1

Stop in /usr/ports/x11/vlc (line 1514 of /usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/x11/vlc (line 2060 of /usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/x11/vlc (line 1545 of /usr/ports/infrastructure/mk/bsd.port.mk).
===> Exiting x11/vlc with an error
*** Error code 1

Stop in /usr/ports (line 140 of /usr/ports/infrastructure/mk/bsd.port.subdir.mk).

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Landry Breuil-5
On Sun, Jun 13, 2010 at 06:13:41PM +0100, Edd Barrett wrote:

> On Mon, Jun 07, 2010 at 02:54:18PM +0200, David Coppa wrote:
> > Hi,
> > I'm resubmitting my update/fix for both livemedia and vlc.
> > I'd like to have this committed so please test it, if you can/care.
> >
> > mplayer's also happy with livemedia update (tested on my laptop).
> > livemedia's distfile should be mirrored...
>
> VLC seems broken on sparc64, but it seems it may have been broken for some time,
> given that there are no packages on the FTP servers:

it doesn't build because qt4 doesn't build, espie is aware of it.

> ===> x11/mplayer
> ===> x11/vlc
> `/usr/ports/pobj/vlc-1.0.6/fake-sparc64/.fake_done' is up to date.
> ===>  Building package for vlc-1.0.6p2
> Create /usr/ports/packages/sparc64/all/vlc-1.0.6p2.tgz
> reading plist...
> checksummingError: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/access/libv4l2_plugin.la does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/access/libv4l2_plugin.so does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.a does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.la does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/demux/liblive555_plugin.so does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/misc/libnotify_plugin.la does not exist
> Error: /usr/ports/pobj/vlc-1.0.6/fake-sparc64/usr/local/lib/vlc/misc/libnotify_plugin.so does not exist

That's a real (separate) issue.

Landry

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Edd Barrett
On Sun, Jun 13, 2010 at 07:17:53PM +0200, Landry Breuil wrote:
> That's a real (separate) issue.

Scratch this - It looks like i forgot to clean before building. Maybe a false
alarm.

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Edd Barrett
On Sun, Jun 13, 2010 at 06:22:04PM +0100, Edd Barrett wrote:
> On Sun, Jun 13, 2010 at 07:17:53PM +0200, Landry Breuil wrote:
> > That's a real (separate) issue.
>
> Scratch this - It looks like i forgot to clean before building. Maybe a false
> alarm.

OK, so what happened here is that I forgot to clean before build. I can't test
vlc on sparc64 as it stands due to qt4 being broken.

As for mplayer, this does not appear to work:

edd-sparc% mplayer rtsp://64.202.98.91:554/gs.sdp
MPlayer SVN-r30866 (C) 2000-2010 MPlayer Team

Playing rtsp://64.202.98.91:554/gs.sdp.
Resolving 64.202.98.91 for AF_INET6...
Couldn't resolve name for AF_INET6: 64.202.98.91
Connecting to server 64.202.98.91[64.202.98.91]: 554...
rtsp_session: unsupported RTSP server. Server type is 'DSS/5.5 (Build/489.7; Pla
tform/Linux; Release/Darwin; )'.
STREAM_LIVE555, URL: rtsp://64.202.98.91:554/gs.sdp
Stream not seekable!
 file format detected.
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
[0/19]Unable to determine our source address: This computer has an invalid IP
address:
 0x7f000001
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
Unable to determine our source address: This computer has an invalid IP address:
 0x7f000001
Initiated "audio/MP4A-LATM" RTP subsession on port 8302
==========================================================================
Opening audio decoder: [faad] AAC (MPEG2/4 Advanced Audio Coding)
FAAD: compressed input bitrate missing, assuming 128kbit/s!
AUDIO: 44100 Hz, 2 ch, s16be, 128.0 kbit/9.07% (ratio: 16000->176400)
Selected audio codec: [faad] afm: faad (FAAD AAC (MPEG-2/MPEG-4 Audio))
==========================================================================
AO: [sndio] 44100Hz 2ch s16be (2 bytes per sample)
Video: no video
Starting playback...
A:   0.0 (unknown) of 0.0 (unknown) ??,?%

Exiting... (End of file)

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Stuart Henderson
> Unable to determine our source address: This computer has an invalid IP address:
>  0x7f000001

try "route delete 224/4", if it helps, add "multicast_host=YES" to rc.conf.local.

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

David Coppa
On Mon, Jun 14, 2010 at 10:50 AM, Stuart Henderson <[hidden email]> wrote:
>> Unable to determine our source address: This computer has an invalid IP address:
>>  0x7f000001
>
> try "route delete 224/4", if it helps, add "multicast_host=YES" to rc.conf.local.

Or try with:

mplayer -rtsp-stream-over-tcp rtsp://64.202.98.91:554/gs.sdp

ciao,
david

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Mattieu Baptiste-2
In reply to this post by David Coppa
On Sun, Jun 13, 2010 at 11:42 AM, David Coppa <[hidden email]> wrote:

> On Sun, Jun 13, 2010 at 3:22 AM, Brad <[hidden email]> wrote:
>
>> I want the changes separated back out to the separate functional
>> changes as you had sent me before. There are various things that
>> need fixing in the various ports you've touched with this combined
>> diff of a few different changes. I'm Ok with you commiting just the
>> patch-src_libvlc_c update and a bump for VLC. Then send me the
>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
>> the roughest part.
>
> You find them attached to this.
>
> One patch for livemedia, one for vlc with just the xul related changes
> and one combined: I hope it will be sufficient.
>
> cheers,
> david
>

Hi,

Is there a reason these patches were not commited ? I know all of this
is old but vlc is fucked since a year, which is really a pain.
I'm still relying on the livemedia/vlc part of these diffs to play
streaming TV flows and they work well.


--
Mattieu Baptiste
"/earth is 102% full ... please delete anyone you can."

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Brad Smith-14
On 16/05/11 5:47 PM, Mattieu Baptiste wrote:

> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa<[hidden email]>  wrote:
>> On Sun, Jun 13, 2010 at 3:22 AM, Brad<[hidden email]>  wrote:
>>
>>> I want the changes separated back out to the separate functional
>>> changes as you had sent me before. There are various things that
>>> need fixing in the various ports you've touched with this combined
>>> diff of a few different changes. I'm Ok with you commiting just the
>>> patch-src_libvlc_c update and a bump for VLC. Then send me the
>>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
>>> the roughest part.
>>
>> You find them attached to this.
>>
>> One patch for livemedia, one for vlc with just the xul related changes
>> and one combined: I hope it will be sufficient.
>>
>> cheers,
>> david
>>
>
> Hi,
>
> Is there a reason these patches were not commited ? I know all of this
> is old but vlc is fucked since a year, which is really a pain.
> I'm still relying on the livemedia/vlc part of these diffs to play
> streaming TV flows and they work well.

I must have lost track of this. Send me the original diffs and I'll
see about coming up with something that can be commited.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Mattieu Baptiste-2
On Mon, May 16, 2011 at 11:51 PM, Brad <[hidden email]> wrote:

> On 16/05/11 5:47 PM, Mattieu Baptiste wrote:
>>
>> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa<[hidden email]>  wrote:
>>>
>>> On Sun, Jun 13, 2010 at 3:22 AM, Brad<[hidden email]>  wrote:
>>>
>>>> I want the changes separated back out to the separate functional
>>>> changes as you had sent me before. There are various things that
>>>> need fixing in the various ports you've touched with this combined
>>>> diff of a few different changes. I'm Ok with you commiting just the
>>>> patch-src_libvlc_c update and a bump for VLC. Then send me the
>>>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
>>>> the roughest part.
>>>
>>> You find them attached to this.
>>>
>>> One patch for livemedia, one for vlc with just the xul related changes
>>> and one combined: I hope it will be sufficient.
>>>
>>> cheers,
>>> david
>>>
>>
>> Hi,
>>
>> Is there a reason these patches were not commited ? I know all of this
>> is old but vlc is fucked since a year, which is really a pain.
>> I'm still relying on the livemedia/vlc part of these diffs to play
>> streaming TV flows and they work well.
>
> I must have lost track of this. Send me the original diffs and I'll
> see about coming up with something that can be commited.
Here are the three original diffs by David Coppa. I can't comment on
the xul part. I have only (positively) tested the livemedia part.


--
Mattieu Baptiste
"/earth is 102% full ... please delete anyone you can."

livemedia.diff (14K) Download Attachment
vlc-combined.diff (70K) Download Attachment
vlc-xul.diff (67K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Landry Breuil-5
On Mon, May 16, 2011 at 11:59:03PM +0200, Mattieu Baptiste wrote:

> On Mon, May 16, 2011 at 11:51 PM, Brad <[hidden email]> wrote:
> > On 16/05/11 5:47 PM, Mattieu Baptiste wrote:
> >>
> >> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa<[hidden email]>  wrote:
> >>>
> >>> On Sun, Jun 13, 2010 at 3:22 AM, Brad<[hidden email]>  wrote:
> >>>
> >>>> I want the changes separated back out to the separate functional
> >>>> changes as you had sent me before. There are various things that
> >>>> need fixing in the various ports you've touched with this combined
> >>>> diff of a few different changes. I'm Ok with you commiting just the
> >>>> patch-src_libvlc_c update and a bump for VLC. Then send me the
> >>>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
> >>>> the roughest part.
> >>>
> >>> You find them attached to this.
> >>>
> >>> One patch for livemedia, one for vlc with just the xul related changes
> >>> and one combined: I hope it will be sufficient.
> >>>
> >>> cheers,
> >>> david
> >>>
> >>
> >> Hi,
> >>
> >> Is there a reason these patches were not commited ? I know all of this
> >> is old but vlc is fucked since a year, which is really a pain.
> >> I'm still relying on the livemedia/vlc part of these diffs to play
> >> streaming TV flows and they work well.
> >
> > I must have lost track of this. Send me the original diffs and I'll
> > see about coming up with something that can be commited.
>
> Here are the three original diffs by David Coppa. I can't comment on
> the xul part. I have only (positively) tested the livemedia part.

Don't want to sound rude, but those diffs are badly outdated. ports
infrastructure changed quite a lot since last year...

Landry

Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Mattieu Baptiste-2
On Tue, May 17, 2011 at 12:05 AM, Landry Breuil <[hidden email]> wrote:

> On Mon, May 16, 2011 at 11:59:03PM +0200, Mattieu Baptiste wrote:
>> On Mon, May 16, 2011 at 11:51 PM, Brad <[hidden email]> wrote:
>> > On 16/05/11 5:47 PM, Mattieu Baptiste wrote:
>> >>
>> >> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa<[hidden email]>  wrote:
>> >>>
>> >>> On Sun, Jun 13, 2010 at 3:22 AM, Brad<[hidden email]>  wrote:
>> >>>
>> >>>> I want the changes separated back out to the separate functional
>> >>>> changes as you had sent me before. There are various things that
>> >>>> need fixing in the various ports you've touched with this combined
>> >>>> diff of a few different changes. I'm Ok with you commiting just the
>> >>>> patch-src_libvlc_c update and a bump for VLC. Then send me the
>> >>>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
>> >>>> the roughest part.
>> >>>
>> >>> You find them attached to this.
>> >>>
>> >>> One patch for livemedia, one for vlc with just the xul related changes
>> >>> and one combined: I hope it will be sufficient.
>> >>>
>> >>> cheers,
>> >>> david
>> >>>
>> >>
>> >> Hi,
>> >>
>> >> Is there a reason these patches were not commited ? I know all of this
>> >> is old but vlc is fucked since a year, which is really a pain.
>> >> I'm still relying on the livemedia/vlc part of these diffs to play
>> >> streaming TV flows and they work well.
>> >
>> > I must have lost track of this. Send me the original diffs and I'll
>> > see about coming up with something that can be commited.
>>
>> Here are the three original diffs by David Coppa. I can't comment on
>> the xul part. I have only (positively) tested the livemedia part.
>
> Don't want to sound rude, but those diffs are badly outdated. ports
> infrastructure changed quite a lot since last year...
>
> Landry
>
Yes, Brad wanted *original* diffs...
Anyway, here is the current vlc diff I use (the livemedia one is unchanged).

--
Mattieu Baptiste
"/earth is 102% full ... please delete anyone you can."

vlc-current.diff (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: RESUBMIT: livemedia & vlc update/fixes

Brad Smith-14
In reply to this post by Landry Breuil-5
On 16/05/11 6:05 PM, Landry Breuil wrote:

> On Mon, May 16, 2011 at 11:59:03PM +0200, Mattieu Baptiste wrote:
>> On Mon, May 16, 2011 at 11:51 PM, Brad<[hidden email]>  wrote:
>>> On 16/05/11 5:47 PM, Mattieu Baptiste wrote:
>>>>
>>>> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa<[hidden email]>    wrote:
>>>>>
>>>>> On Sun, Jun 13, 2010 at 3:22 AM, Brad<[hidden email]>    wrote:
>>>>>
>>>>>> I want the changes separated back out to the separate functional
>>>>>> changes as you had sent me before. There are various things that
>>>>>> need fixing in the various ports you've touched with this combined
>>>>>> diff of a few different changes. I'm Ok with you commiting just the
>>>>>> patch-src_libvlc_c update and a bump for VLC. Then send me the
>>>>>> VLC bits to update xulrunner and I'll look at it. The live555 bits were
>>>>>> the roughest part.
>>>>>
>>>>> You find them attached to this.
>>>>>
>>>>> One patch for livemedia, one for vlc with just the xul related changes
>>>>> and one combined: I hope it will be sufficient.
>>>>>
>>>>> cheers,
>>>>> david
>>>>>
>>>>
>>>> Hi,
>>>>
>>>> Is there a reason these patches were not commited ? I know all of this
>>>> is old but vlc is fucked since a year, which is really a pain.
>>>> I'm still relying on the livemedia/vlc part of these diffs to play
>>>> streaming TV flows and they work well.
>>>
>>> I must have lost track of this. Send me the original diffs and I'll
>>> see about coming up with something that can be commited.
>>
>> Here are the three original diffs by David Coppa. I can't comment on
>> the xul part. I have only (positively) tested the livemedia part.
>
> Don't want to sound rude, but those diffs are badly outdated. ports
> infrastructure changed quite a lot since last year...
>
> Landry

That's not really the point. I'll take a look at them and come up with
my own diffs with the appropriate relevant changes.


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.