diff options
| author | wiz <wiz@pkgsrc.org> | 2016-07-21 12:21:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-07-21 12:21:35 +0000 |
| commit | 765332c1575a4ac8705c391285e5268b6a7a126b (patch) | |
| tree | 3b74f0d74df0bd4cdb235e897b840f88eba40d8d /multimedia | |
| parent | 3174884794e47219d638204d2436f517404ac5ad (diff) | |
| download | pkgsrc-765332c1575a4ac8705c391285e5268b6a7a126b.tar.gz | |
Environment variable fix for libdvdcss 1.4.0 and later.
From Rhialto in PR 51347.
Bump PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-src_input_input__dvd.c | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index f3fa4788a49..19094433a09 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.142 2016/07/09 06:38:40 wiz Exp $ +# $NetBSD: Makefile,v 1.143 2016/07/21 12:21:35 wiz Exp $ -PKGREVISION= 6 +PKGREVISION= 7 .include "Makefile.common" COMMENT= Multimedia player library diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 958b75b5a8c..bf7b501246d 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.106 2016/06/19 23:05:17 joerg Exp $ +$NetBSD: distinfo,v 1.107 2016/07/21 12:21:35 wiz Exp $ SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5 RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da @@ -25,6 +25,7 @@ SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067 SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d +SHA1 (patch-src_input_input__dvd.c) = 9e491411a22e1f4467ce0e1aba83346305a1b6d3 SHA1 (patch-src_video__out_Makefile.am) = 49a3c53da9cde55a96b5798cc32467f9334e2d76 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115 SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7 diff --git a/multimedia/xine-lib/patches/patch-src_input_input__dvd.c b/multimedia/xine-lib/patches/patch-src_input_input__dvd.c new file mode 100644 index 00000000000..2387e2f013a --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src_input_input__dvd.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_input_input__dvd.c,v 1.1 2016/07/21 12:21:36 wiz Exp $ + +Environment variable fix for libdvdcss 1.4.0 and later. + +--- src/input/input_dvd.c.orig 2016-07-19 20:02:16.000000000 +0000 ++++ src/input/input_dvd.c +@@ -1401,7 +1401,11 @@ static int dvd_parse_try_open(dvd_input_ + /* we have an alternative dvd_path */ + intended_dvd_device = locator; + /* do not use the raw device for the alternative */ ++#if 1 /* libdvdcss version 1.4.0 or later */ ++ unsetenv("DVDCSS_RAW_DEVICE"); ++#else + xine_setenv("DVDCSS_RAW_DEVICE", "", 1); ++#endif + } else { + /* use default DVD device */ + dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class; |