kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add support for dvb capture on netbsd

Browse source
This commit is contained in:
jmcneill 2011-07-09 15:51:51 +00:00
parent b64b38869f
commit 66b3354f00
8 changed files with 94 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
multimedia/gmplayer/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.90 2011/04/22 13:44:15 obache Exp $
# $NetBSD: Makefile,v 1.91 2011/07/09 15:51:52 jmcneill Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
@ -9,7 +9,7 @@
#
PKGNAME= gmplayer-${MPLAYER_VERSION}
PKGREVISION= 6
PKGREVISION= 7
SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
http://www2.mplayerhq.hu/MPlayer/skins/ \

6
multimedia/gmplayer/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.72 2011/01/20 07:13:31 obache Exp $
$NetBSD: distinfo,v 1.73 2011/07/09 15:51:52 jmcneill Exp $
SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@ -63,7 +63,7 @@ Size (mplayer/xanim-1.6.tar.bz2) = 94564 bytes
SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
SHA1 (patch-aa) = 9eae4563081e370d14560bb407a9b986b0128d7f
SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
@ -72,5 +72,7 @@ SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89

4
multimedia/mencoder/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.51 2011/03/10 10:20:19 obache Exp $
# $NetBSD: Makefile,v 1.52 2011/07/09 15:51:52 jmcneill Exp $
PKGNAME= mencoder-${MPLAYER_VERSION}
PKGREVISION= 2
PKGREVISION= 3
COMMENT= Simple movie encoder for MPlayer-playable movies

6
multimedia/mplayer-share/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.70 2011/01/14 10:44:27 wiz Exp $
$NetBSD: distinfo,v 1.71 2011/07/09 15:51:51 jmcneill Exp $
SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
SHA1 (patch-aa) = 9eae4563081e370d14560bb407a9b986b0128d7f
SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
@ -12,5 +12,7 @@ SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89

46
multimedia/mplayer-share/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.26 2010/12/05 16:42:16 tsutsui Exp $
$NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
--- configure.orig 2010-09-13 03:12:07.000000000 +0000
+++ configure
@ -86,6 +86,50 @@ $NetBSD: patch-aa,v 1.26 2010/12/05 16:42:16 tsutsui Exp $
else
_ld_tmp="$I -lXext -lX11 $_ld_pthread"
fi
@@ -5016,7 +5016,6 @@ EOF
extra_cflags="$extra_cflags $_inc_tmp" && break
done
fi
-echores "$_dvb"
if test "$_dvb" = yes ; then
_dvbin=yes
inputmodules="dvb $inputmodules"
@@ -5025,14 +5024,28 @@ if test "$_dvb" = yes ; then
aomodules="mpegpes(dvb) $aomodules"
vomodules="mpegpes(dvb) $vomodules"
else
- _dvbin=no
- noinputmodules="dvb $noinputmodules"
- def_dvb='#undef CONFIG_DVB'
- def_dvbin='#undef CONFIG_DVBIN '
- aomodules="mpegpes(file) $aomodules"
- vomodules="mpegpes(file) $vomodules"
+ cat >$TMPC <<EOF
+#include <dev/dtv/dtvio.h>
+int main(void) {return 0;}
+EOF
+ cc_check && _dvb=yes
+ if test "$_dvb" = yes ; then
+ _dvbin=yes
+ inputmodules="dvb $inputmodules"
+ def_dvb='#undef CONFIG_DVB'
+ def_dvbin='#define CONFIG_DVBIN 1'
+ aomodules="mpegpes(file) $aomodules"
+ vomodules="mpegpes(file) $vomodules"
+ else
+ _dvbin=no
+ noinputmodules="dvb $noinputmodules"
+ def_dvb='#undef CONFIG_DVB'
+ def_dvbin='#undef CONFIG_DVBIN '
+ aomodules="mpegpes(file) $aomodules"
+ vomodules="mpegpes(file) $vomodules"
+ fi
fi
-
+echores "$_dvb"
if darwin; then
@@ -5623,8 +5637,13 @@ if test "$_ivtv" = auto ; then
cat > $TMPC << EOF
#include <stdlib.h>

17
multimedia/mplayer-share/patches/patch-stream_dvb_tune.c Normal file
View file

@ -0,0 +1,17 @@
$NetBSD: patch-stream_dvb_tune.c,v 1.1 2011/07/09 15:51:52 jmcneill Exp $
--- stream/dvb_tune.c.orig 2010-03-02 19:57:17.000000000 +0000
+++ stream/dvb_tune.c
@@ -32,8 +32,12 @@
#include <fcntl.h>
#include <time.h>
#include <errno.h>
+#ifdef __NetBSD__
+#include <dev/dtv/dtvio.h>
+#else
#include <linux/dvb/dmx.h>
#include <linux/dvb/frontend.h>
+#endif
#include "config.h"
#include "dvbin.h"
#include "dvb_tune.h"

18
multimedia/mplayer-share/patches/patch-stream_dvbin.h Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: patch-stream_dvbin.h,v 1.1 2011/07/09 15:51:52 jmcneill Exp $
--- stream/dvbin.h.orig 2010-06-21 14:39:24.000000000 +0000
+++ stream/dvbin.h
@@ -16,9 +16,13 @@
#define LOF2 (10600*1000UL)
#include <inttypes.h>
+#ifdef __NetBSD__
+#include <dev/dtv/dtvio.h>
+#else
#include <linux/dvb/dmx.h>
#include <linux/dvb/frontend.h>
#include <linux/dvb/version.h>
+#endif
#undef DVB_ATSC
#if defined(DVB_API_VERSION_MINOR)

4
multimedia/mplayer/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.78 2011/03/10 10:20:18 obache Exp $
# $NetBSD: Makefile,v 1.79 2011/07/09 15:51:51 jmcneill Exp $
PKGNAME= mplayer-${MPLAYER_VERSION}
PKGREVISION= 6
PKGREVISION= 7
COMMENT= Fast, cross-platform movie player