pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc xine-lib: Update to 1.2.11
details: https://anonhg.NetBSD.org/pkgsrc/rev/e2eb3bcaa190
branches: trunk
changeset: 443651:e2eb3bcaa190
user: nia <nia%pkgsrc.org@localhost>
date: Fri Dec 18 23:33:05 2020 +0000
description:
xine-lib: Update to 1.2.11
xine-lib (1.2.11) 2020-12-06
* Add gopher input plugin.
* Add user settings for IPv6.
* Split a52 spdif output to separate decoder.
* Code cleanup.
* More engine optimization.
* Small optimizations (opengl2, dvb subtitles, png, mpeg-ts).
* Better A/V sync.
* Fix a few crashes.
* Fix bluray playback.
* Fix VAAPI picture jitter and green flashes.
* Fix Opus and EAC3 audio playback.
* Fix text subtitles.
* Fix mpeg-ts (hdmv mode, detection of cut TV recordings).
* Fix mpeg layer 1-4 audio timing.
* Fix some VDR issues.
* Fix HLS VOD mode.
* Many small fixes.
* Build fixes.
* BSD fixes.
* Update german translation.
* Update internal libdca to upstream 0.0.7.
diffstat:
audio/xine-alsa/Makefile | 3 +-
audio/xine-pulse/Makefile | 3 +-
multimedia/xine-lib/Makefile | 13 +++++++++--
multimedia/xine-lib/Makefile.common | 8 +++---
multimedia/xine-lib/PLIST.Linux | 6 +----
multimedia/xine-lib/PLIST.common | 8 ++++++-
multimedia/xine-lib/PLIST.common_end | 2 -
multimedia/xine-lib/distinfo | 13 +++++------
multimedia/xine-lib/patches/patch-include_xine_xineutils.h | 15 +++++++++++--
multimedia/xine-lib/patches/patch-src_input_input__cdda.c | 15 --------------
multimedia/xine-v4l/Makefile | 3 +-
multimedia/xine-v4l2/Makefile | 3 +-
12 files changed, 44 insertions(+), 48 deletions(-)
diffs (254 lines):
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 audio/xine-alsa/Makefile
--- a/audio/xine-alsa/Makefile Fri Dec 18 23:26:19 2020 +0000
+++ b/audio/xine-alsa/Makefile Fri Dec 18 23:33:05 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2020/12/18 23:33:05 nia Exp $
-PKGREVISION= 2
.include "../../multimedia/xine-lib/Makefile.common"
PKGNAME= ${XINE_PKGNAME:S/lib/alsa/}
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 audio/xine-pulse/Makefile
--- a/audio/xine-pulse/Makefile Fri Dec 18 23:26:19 2020 +0000
+++ b/audio/xine-pulse/Makefile Fri Dec 18 23:33:05 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.49 2020/08/31 18:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2020/12/18 23:33:05 nia Exp $
-PKGREVISION= 3
.include "../../multimedia/xine-lib/Makefile.common"
PKGNAME= ${XINE_PKGNAME:S/lib/pulse/}
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/Makefile Fri Dec 18 23:33:05 2020 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2020/11/16 12:15:28 nia Exp $
-
-PKGREVISION= 7
+# $NetBSD: Makefile,v 1.168 2020/12/18 23:33:06 nia Exp $
.include "Makefile.common"
@@ -18,6 +16,15 @@
CONFIGURE_ARGS+= --disable-w32dll
CONFIGURE_ARGS+= --disable-xvmc
+.include "../../multimedia/libvdpau/available.mk"
+
+PLIST_VARS+= vdpau
+.if ${VDPAU_AVAILABLE} == "yes"
+PLIST.vdpau= yes
+CONFIGURE_ARGS+= --enable-vdpau
+. include "../../multimedia/libvdpau/buildlink3.mk"
+.endif
+
CONFIGURE_ARGS+= --without-dav1d
CONFIGURE_ARGS+= --without-esound
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/Makefile.common Fri Dec 18 23:33:05 2020 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.90 2020/04/02 15:52:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.91 2020/12/18 23:33:06 nia Exp $
#
# used by audio/xine-alsa/Makefile
# used by audio/xine-pulse/Makefile
# used by multimedia/xine-v4l/Makefile
# used by multimedia/xine-v4l2/Makefile
-DISTNAME= xine-lib-1.2.10
-XINE_PKGNAME= xine-lib-1.2.10
+DISTNAME= xine-lib-1.2.11
+XINE_PKGNAME= xine-lib-1.2.11
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -17,7 +17,7 @@
MAKE_JOBS_SAFE= no
-XINE_MOD_DIR_VER= 2.8
+XINE_MOD_DIR_VER= 2.9
PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/PLIST.Linux
--- a/multimedia/xine-lib/PLIST.Linux Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/PLIST.Linux Fri Dec 18 23:33:05 2020 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST.Linux,v 1.21 2020/11/16 12:15:28 nia Exp $
+@comment $NetBSD: PLIST.Linux,v 1.22 2020/12/18 23:33:06 nia Exp $
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dxr3.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dxr3.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a
@@ -11,5 +9,3 @@
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.so
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/PLIST.common Fri Dec 18 23:33:05 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.42 2020/04/02 17:46:40 nia Exp $
+@comment $NetBSD: PLIST.common,v 1.43 2020/12/18 23:33:06 nia Exp $
bin/xine-config
bin/xine-list-1.2
include/xine.h
@@ -92,6 +92,8 @@
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpeg2.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rawvideo.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rawvideo.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_to_spdif.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_to_spdif.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucc.a
@@ -102,6 +104,8 @@
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.so
+${PLIST.vdpau}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a
+${PLIST.vdpau}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.a
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.so
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_audio.a
@@ -166,6 +170,8 @@
lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.so
${PLIST.sdl}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.a
${PLIST.sdl}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.so
+${PLIST.vdpau}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.a
+${PLIST.vdpau}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.so
${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.a
${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.so
${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/PLIST.common_end
--- a/multimedia/xine-lib/PLIST.common_end Fri Dec 18 23:26:19 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.13 2009/06/14 20:53:26 joerg Exp $
-@pkgdir lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/distinfo Fri Dec 18 23:33:05 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.113 2020/11/16 12:15:28 nia Exp $
+$NetBSD: distinfo,v 1.114 2020/12/18 23:33:06 nia Exp $
-SHA1 (xine-lib-1.2.10.tar.xz) = 66fe7a7d372f74967df46834167f85f5c2d43ae7
-RMD160 (xine-lib-1.2.10.tar.xz) = 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c
-SHA512 (xine-lib-1.2.10.tar.xz) = 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
-Size (xine-lib-1.2.10.tar.xz) = 5226116 bytes
+SHA1 (xine-lib-1.2.11.tar.xz) = eff3d39d9d9575ac99d326ed9d26647fd3233271
+RMD160 (xine-lib-1.2.11.tar.xz) = 025b1bd5b46e98d8676293359f6e4237df7d7e39
+SHA512 (xine-lib-1.2.11.tar.xz) = 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
+Size (xine-lib-1.2.11.tar.xz) = 5282204 bytes
SHA1 (patch-ag) = ef924c08b4d1d0dbc48f619d69b608c9d0def9fe
SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 8dd88fd712853e58363148023be6ef0906486206
SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
SHA1 (patch-include_xine_post.h) = 3ada327a7f171bdf680074b30f005099011a201c
-SHA1 (patch-include_xine_xineutils.h) = a8e32954433fcbd035dfe1416623c3e22ac754c2
+SHA1 (patch-include_xine_xineutils.h) = d59b517c966eb3f7935ab704525ed9e510d8bc17
SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
@@ -25,7 +25,6 @@
SHA1 (patch-src-post-planar-noise.c) = db5ba28ae527995084ce3ad65c52867209d4b13f
SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
-SHA1 (patch-src_input_input__cdda.c) = 7dddab513b42ff334319da6fbd858f036d6665cd
SHA1 (patch-src_input_input__http.c) = 80de20be0f99efa5cb67230c900acbf6e4ee9e7c
SHA1 (patch-src_video__out_Makefile.am) = 623e41b3f142426c5128c6c61c6ebefee170734e
SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/patches/patch-include_xine_xineutils.h
--- a/multimedia/xine-lib/patches/patch-include_xine_xineutils.h Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-lib/patches/patch-include_xine_xineutils.h Fri Dec 18 23:33:05 2020 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-include_xine_xineutils.h,v 1.1 2020/04/12 11:09:05 nia Exp $
+$NetBSD: patch-include_xine_xineutils.h,v 1.2 2020/12/18 23:33:06 nia Exp $
Don't reimplement memcpy. Actually not compatible with clang:
../../include/xine/xineutils.h:211:63: error: fields must have a constant size:
'variable length array in structure' extension will never be supported
---- include/xine/xineutils.h.orig 2019-12-13 20:47:50.000000000 +0000
+--- include/xine/xineutils.h.orig 2020-11-19 10:30:37.000000000 +0000
+++ include/xine/xineutils.h
-@@ -200,26 +200,6 @@ extern void *(* xine_fast_memcpy)(void *
+@@ -200,35 +200,6 @@ extern void *(* xine_fast_memcpy)(void *
/* len (usually) < 500, but not a build time constant. */
#define xine_small_memcpy(xsm_to,xsm_from,xsm_len) memcpy (xsm_to, xsm_from, xsm_len)
@@ -17,12 +17,21 @@
-static inline void *xine_small_memcpy (void *to, const void *from, size_t len) {
- void *t2 = to;
- size_t l2 = len;
+-# if !defined(__clang__)
- __asm__ __volatile__ (
- "cld\n\trep movsb"
- : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)
- : "0" (from), "1" (t2), "2" (l2)
- : "cc"
- );
+-# else /* clang dislikes virtual variable size struct */
+- __asm__ __volatile__ (
+- "cld\n\trep movsb"
+- : "=S" (from), "=D" (t2), "=c" (l2)
+- : "0" (from), "1" (t2), "2" (l2)
+- : "cc", "memory"
+- );
+-# endif
- (void)from;
- (void)t2;
- (void)l2;
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-lib/patches/patch-src_input_input__cdda.c
--- a/multimedia/xine-lib/patches/patch-src_input_input__cdda.c Fri Dec 18 23:26:19 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_input_input__cdda.c,v 1.1 2020/04/02 15:52:46 nia Exp $
-
-Fix syntax.
-
---- src/input/input_cdda.c.orig 2019-12-13 20:47:50.000000000 +0000
-+++ src/input/input_cdda.c
-@@ -874,7 +874,7 @@ static cdrom_toc_t *read_cdrom_toc (int
- toc->toc_entries[i].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
- toc->toc_entries[i].first_frame_minute = tocentry.data->addr.msf.minute;
- toc->toc_entries[i].first_frame_second = tocentry.data->addr.msf.second;
-- toc->toc_entries[i]..first_frame_frame = tocentry.data->addr.msf.frame;
-+ toc->toc_entries[i].first_frame_frame = tocentry.data->addr.msf.frame;
- toc->toc_entries[i].first_frame =
- (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
- (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-v4l/Makefile
--- a/multimedia/xine-v4l/Makefile Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-v4l/Makefile Fri Dec 18 23:33:05 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.29 2020/08/31 18:10:30 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2020/12/18 23:33:06 nia Exp $
-PKGREVISION= 2
.include "../../multimedia/xine-lib/Makefile.common"
PKGNAME= ${XINE_PKGNAME:S/lib/v4l/}
diff -r 770c4c7d7bb9 -r e2eb3bcaa190 multimedia/xine-v4l2/Makefile
--- a/multimedia/xine-v4l2/Makefile Fri Dec 18 23:26:19 2020 +0000
+++ b/multimedia/xine-v4l2/Makefile Fri Dec 18 23:33:05 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:10:31 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2020/12/18 23:33:06 nia Exp $
-PKGREVISION= 2
.include "../../multimedia/xine-lib/Makefile.common"
PKGNAME= ${XINE_PKGNAME:S/lib/v4l2/}
Home |
Main Index |
Thread Index |
Old Index