Re: RESUBMIT: livemedia & vlc update/fixes
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 wrote: On 16/05/11 5:47 PM, Mattieu Baptiste wrote: On Sun, Jun 13, 2010 at 11:42 AM, David Coppawrote: On Sun, Jun 13, 2010 at 3:22 AM, Bradwrote: 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.
Re: RESUBMIT: livemedia & vlc update/fixes
On Tue, May 17, 2011 at 12:05 AM, 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 wrote: >> > On 16/05/11 5:47 PM, Mattieu Baptiste wrote: >> >> >> >> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa wrote: >> >>> >> >>> On Sun, Jun 13, 2010 at 3:22 AM, Brad 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 Description: Binary data
Re: RESUBMIT: livemedia & vlc update/fixes
On Mon, May 16, 2011 at 11:59:03PM +0200, Mattieu Baptiste wrote: > On Mon, May 16, 2011 at 11:51 PM, Brad wrote: > > On 16/05/11 5:47 PM, Mattieu Baptiste wrote: > >> > >> On Sun, Jun 13, 2010 at 11:42 AM, David Coppa wrote: > >>> > >>> On Sun, Jun 13, 2010 at 3:22 AM, Brad 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
Re: RESUBMIT: livemedia & vlc update/fixes
On 16/05/11 5:47 PM, Mattieu Baptiste wrote: On Sun, Jun 13, 2010 at 11:42 AM, David Coppa wrote: On Sun, Jun 13, 2010 at 3:22 AM, Brad 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.
Re: RESUBMIT: livemedia & vlc update/fixes
On Sun, Jun 13, 2010 at 11:42 AM, David Coppa wrote: > On Sun, Jun 13, 2010 at 3:22 AM, Brad 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."
Re: RESUBMIT: livemedia & vlc update/fixes
On Mon, Jun 14, 2010 at 10:50 AM, Stuart Henderson wrote: >> Unable to determine our source address: This computer has an invalid IP >> address: >> 0x7f01 > > 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
Re: RESUBMIT: livemedia & vlc update/fixes
> Unable to determine our source address: This computer has an invalid IP > address: > 0x7f01 try "route delete 224/4", if it helps, add "multicast_host=YES" to rc.conf.local.
Re: RESUBMIT: livemedia & vlc update/fixes
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: 0x7f01 Unable to determine our source address: This computer has an invalid IP address: 0x7f01 Unable to determine our source address: This computer has an invalid IP address: 0x7f01 [0/19]Unable to determine our source address: This computer has an invalid IP address: 0x7f01 Unable to determine our source address: This computer has an invalid IP address: 0x7f01 Unable to determine our source address: This computer has an invalid IP address: 0x7f01 Unable to determine our source address: This computer has an invalid IP address: 0x7f01 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
Re: RESUBMIT: livemedia & vlc update/fixes
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
Re: RESUBMIT: livemedia & vlc update/fixes
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
Re: RESUBMIT: livemedia & vlc update/fixes
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
Re: RESUBMIT: livemedia & vlc update/fixes
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
Re: RESUBMIT: livemedia & vlc update/fixes
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/Makefile15 Apr 2009 08:22:11 - 1.9
> +++ net/livemedia/Makefile7 Jun 2010 12:35:28 -
> @@ -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/distinfo15 Apr 2009 08:22:11 - 1.7
> +++ net/livemedia/distinfo7 Jun 2010 12:35:28 -
> @@ -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
> - 1.1.1.1 +++ net/livemedia/files/config.fixed-openbsd
Re: RESUBMIT: livemedia & vlc update/fixes
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 - 1.9
+++ net/livemedia/Makefile 7 Jun 2010 12:35:28 -
@@ -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 - 1.7
+++ net/livemedia/distinfo 7 Jun 2010 12:35:28 -
@@ -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-openbsd19 Apr 2007 08:32:23 -
1.1.1.1
+++ net/livemedia/files/config.fixed-openbsd7 Jun 2010 12:35:28 -
@@ -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_Make
RESUBMIT: livemedia & vlc update/fixes
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 - 1.9
+++ net/livemedia/Makefile 7 Jun 2010 12:35:28 -
@@ -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 - 1.7
+++ net/livemedia/distinfo 7 Jun 2010 12:35:28 -
@@ -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-openbsd19 Apr 2007 08:32:23 -
1.1.1.1
+++ net/livemedia/files/config.fixed-openbsd7 Jun 2010 12:35:28 -
@@ -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
===
