CVS commit: pkgsrc/multimedia/xine-lib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/xine-lib
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 3 Jan 2026 14:10:40 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jan  3 14:10:40 UTC 2026

Modified Files:
        pkgsrc/multimedia/xine-lib: Makefile Makefile.common PLIST.common
            buildlink3.mk distinfo options.mk
        pkgsrc/multimedia/xine-lib/patches: patch-include_xine_xineutils.h
Added Files:
        pkgsrc/multimedia/xine-lib/patches: patch-configure
            patch-m4_decoders.m4
Removed Files:
        pkgsrc/multimedia/xine-lib/patches: patch-src_input_input__pvr.c
            patch-src_video__dec_dav1d.c

Log Message:
xine-lib: Update to 1.2.13

Verified to build on NetBSD, FreeBSD, Darwin, CentOS 7, illumos.

This release includes various optimizations, compatibility with newer
ffmpeg and dav1d libraries, and a couple of minor fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/multimedia/xine-lib/Makefile.common
cvs rdiff -u -r1.45 -r1.46 pkgsrc/multimedia/xine-lib/PLIST.common
cvs rdiff -u -r1.51 -r1.52 pkgsrc/multimedia/xine-lib/buildlink3.mk
cvs rdiff -u -r1.120 -r1.121 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/xine-lib/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-configure \
    pkgsrc/multimedia/xine-lib/patches/patch-m4_decoders.m4
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/xine-lib/patches/patch-src_input_input__pvr.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.211 pkgsrc/multimedia/xine-lib/Makefile:1.212
--- pkgsrc/multimedia/xine-lib/Makefile:1.211   Fri Dec 26 11:12:07 2025
+++ pkgsrc/multimedia/xine-lib/Makefile Sat Jan  3 14:10:39 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.211 2025/12/26 11:12:07 adam Exp $
+# $NetBSD: Makefile,v 1.212 2026/01/03 14:10:39 nia Exp $
 
-PKGREVISION= 31
 .include "Makefile.common"
 
 COMMENT=               Multimedia player library

Index: pkgsrc/multimedia/xine-lib/Makefile.common
diff -u pkgsrc/multimedia/xine-lib/Makefile.common:1.97 pkgsrc/multimedia/xine-lib/Makefile.common:1.98
--- pkgsrc/multimedia/xine-lib/Makefile.common:1.97     Sun Dec 25 17:32:52 2022
+++ pkgsrc/multimedia/xine-lib/Makefile.common  Sat Jan  3 14:10:39 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.97 2022/12/25 17:32:52 nia Exp $
+# $NetBSD: Makefile.common,v 1.98 2026/01/03 14:10:39 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.12
+DISTNAME=              xine-lib-1.2.13
 XINE_PKGNAME=          ${DISTNAME}
 PKGNAME?=              ${XINE_PKGNAME}
 CATEGORIES?=           multimedia
@@ -19,7 +19,7 @@ TOOL_DEPENDS+=                gettext-tools-[0-9]*:../
 
 MAKE_JOBS_SAFE=                no
 
-XINE_MOD_DIR_VER=      2.10
+XINE_MOD_DIR_VER=      2.11
 PLIST_SUBST+=          XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=         ${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -56,6 +56,6 @@ pre-configure:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/multimedia/xine-lib/PLIST.common
diff -u pkgsrc/multimedia/xine-lib/PLIST.common:1.45 pkgsrc/multimedia/xine-lib/PLIST.common:1.46
--- pkgsrc/multimedia/xine-lib/PLIST.common:1.45        Sun Apr 10 16:47:32 2022
+++ pkgsrc/multimedia/xine-lib/PLIST.common     Sat Jan  3 14:10:39 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.45 2022/04/10 16:47:32 nia Exp $
+@comment $NetBSD: PLIST.common,v 1.46 2026/01/03 14:10:39 nia Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -158,16 +158,16 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xin
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_sputext.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vdr.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vdr.so
-${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.a
-${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.so
+${PLIST.glx}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.a
+${PLIST.glx}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.so
 ${PLIST.egl}${PLIST.wayland}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_wl.a
 ${PLIST.egl}${PLIST.wayland}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_wl.so
 ${PLIST.egl}${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_x11.a
 ${PLIST.egl}${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_x11.so
 ${PLIST.aalib}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.a
 ${PLIST.aalib}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.so
-${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.a
-${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.so
+${PLIST.glx}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.a
+${PLIST.glx}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.so
 ${PLIST.gl2}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl2.a
 ${PLIST.gl2}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl2.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.a

Index: pkgsrc/multimedia/xine-lib/buildlink3.mk
diff -u pkgsrc/multimedia/xine-lib/buildlink3.mk:1.51 pkgsrc/multimedia/xine-lib/buildlink3.mk:1.52
--- pkgsrc/multimedia/xine-lib/buildlink3.mk:1.51       Mon Dec 22 06:08:15 2025
+++ pkgsrc/multimedia/xine-lib/buildlink3.mk    Sat Jan  3 14:10:39 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2025/12/22 06:08:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2026/01/03 14:10:39 nia Exp $
 
 BUILDLINK_TREE+=       xine-lib
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.xine-lib+=        xine-li
 BUILDLINK_ABI_DEPENDS.xine-lib+=       xine-lib>=1.2.12nb30
 BUILDLINK_PKGSRCDIR.xine-lib?=         ../../multimedia/xine-lib
 
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
 .endif # XINE_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xine-lib

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.120 pkgsrc/multimedia/xine-lib/distinfo:1.121
--- pkgsrc/multimedia/xine-lib/distinfo:1.120   Fri Dec  2 15:06:22 2022
+++ pkgsrc/multimedia/xine-lib/distinfo Sat Jan  3 14:10:39 2026
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.120 2022/12/02 15:06:22 jperkin Exp $
+$NetBSD: distinfo,v 1.121 2026/01/03 14:10:39 nia Exp $
 
-BLAKE2s (xine-lib-1.2.12.tar.xz) = 6576144af35552e4c9144ab7981520f014ce78ad790e61e1fb526ec15bc8f283
-SHA512 (xine-lib-1.2.12.tar.xz) = cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
-Size (xine-lib-1.2.12.tar.xz) = 5341212 bytes
+BLAKE2s (xine-lib-1.2.13.tar.xz) = e066b7515caf4388d0bf2a73e6d51a1f8acf646e5f198395cb26ad9bcf9384f8
+SHA512 (xine-lib-1.2.13.tar.xz) = 088a446dd962c3cef621b56edd48fa2e1b47566108b4097d74899a9e5316a1f205993041d3070f45b706f168837579811e5e98c7e52ec278c683379407084bc4
+Size (xine-lib-1.2.13.tar.xz) = 5004196 bytes
 SHA1 (patch-ag) = 82b9464f57f93e84be1d9cf60315a9b3e1cd3812
+SHA1 (patch-configure) = bb79984c2fdd42f9d052ad396c429448754f1671
 SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 8dd88fd712853e58363148023be6ef0906486206
 SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
 SHA1 (patch-include_xine_post.h) = 3ada327a7f171bdf680074b30f005099011a201c
-SHA1 (patch-include_xine_xineutils.h) = d59b517c966eb3f7935ab704525ed9e510d8bc17
+SHA1 (patch-include_xine_xineutils.h) = 0c8ec0959c82862b31435396e24ceee4ccbcd51a
+SHA1 (patch-m4_decoders.m4) = 4a5703b56336a033110aaff5294be80f1621dad3
 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
@@ -24,7 +26,5 @@ SHA1 (patch-src-post-planar-noise.c) = 2
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
 SHA1 (patch-src_input_input__http.c) = 80de20be0f99efa5cb67230c900acbf6e4ee9e7c
-SHA1 (patch-src_input_input__pvr.c) = b6429e9a7c9309cbe9eb1bf5f50ab6b6c06d5b0c
-SHA1 (patch-src_video__dec_dav1d.c) = 26fabb94cc83a74057fc2082bb4dfb299c3452ef
 SHA1 (patch-src_video__out_Makefile.am) = 623e41b3f142426c5128c6c61c6ebefee170734e
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115

Index: pkgsrc/multimedia/xine-lib/options.mk
diff -u pkgsrc/multimedia/xine-lib/options.mk:1.4 pkgsrc/multimedia/xine-lib/options.mk:1.5
--- pkgsrc/multimedia/xine-lib/options.mk:1.4   Thu Apr  2 17:46:40 2020
+++ pkgsrc/multimedia/xine-lib/options.mk       Sat Jan  3 14:10:39 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/04/02 17:46:40 nia Exp $
+# $NetBSD: options.mk,v 1.5 2026/01/03 14:10:39 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xine-lib
 
@@ -26,7 +26,7 @@ PKG_SUGGESTED_OPTIONS+=       x11
 PKG_SUGGESTED_OPTIONS+=        wayland
 .endif
 
-PLIST_VARS+=   gl2
+PLIST_VARS+=   glx gl2
 
 .include "../../mk/bsd.options.mk"
 
@@ -70,7 +70,10 @@ CONFIGURE_ARGS+=     --disable-wayland
 PLIST_VARS+=           x11
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST.x11=             yes
+.  if ${OPSYS} != "Darwin"
 PLIST.gl2=             yes
+PLIST.glx=             yes
+.  endif
 CONFIGURE_ARGS+=       --with-x
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"

Index: pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h
diff -u pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h:1.2 pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h:1.3
--- pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h:1.2       Fri Dec 18 23:33:06 2020
+++ pkgsrc/multimedia/xine-lib/patches/patch-include_xine_xineutils.h   Sat Jan  3 14:10:39 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-include_xine_xineutils.h,v 1.2 2020/12/18 23:33:06 nia Exp $
+$NetBSD: patch-include_xine_xineutils.h,v 1.3 2026/01/03 14:10:39 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      2020-11-19 10:30:37.000000000 +0000
+--- include/xine/xineutils.h.orig      2022-09-05 18:19:26.000000000 +0000
 +++ include/xine/xineutils.h
-@@ -200,35 +200,6 @@ extern void *(* xine_fast_memcpy)(void *
+@@ -201,35 +201,6 @@ extern void *(* xine_fast_memcpy)(void *to, const 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,7 +17,7 @@ Don't reimplement memcpy. Actually not c
 -static inline void *xine_small_memcpy (void *to, const void *from, size_t len) {
 -  void *t2 = to;
 -  size_t l2 = len;
--#    if !defined(__clang__)
+-#    if !defined(__clang__) && !defined(__cplusplus)
 -  __asm__ __volatile__ (
 -    "cld\n\trep movsb"
 -    : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)

Added files:

Index: pkgsrc/multimedia/xine-lib/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-configure:1.1
--- /dev/null   Sat Jan  3 14:10:40 2026
+++ pkgsrc/multimedia/xine-lib/patches/patch-configure  Sat Jan  3 14:10:39 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2026/01/03 14:10:39 nia Exp $
+
+Fix shell portability.
+
+--- configure.orig     2026-01-03 11:56:13.501029265 +0000
++++ configure
+@@ -31662,7 +31662,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+   have_avutil_avcodec_h=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-            test x"$have_avutil_avcodec_h" == x"yes" &&
++            test x"$have_avutil_avcodec_h" = x"yes" &&
+ $as_echo "#define HAVE_AVUTIL_AVCODEC_H 1" >>confdefs.h
+ 
+             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -31686,7 +31686,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+   have_avformat_avformat_h=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-            test x"$have_avformat_avformat_h" == x"yes" &&
++            test x"$have_avformat_avformat_h" = x"yes" &&
+ $as_echo "#define HAVE_AVFORMAT_AVFORMAT_H 1" >>confdefs.h
+ 
+             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -31711,7 +31711,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+   have_avformat_avio_h=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-            test x"$have_avformat_avio_h" == x"yes" &&
++            test x"$have_avformat_avio_h" = x"yes" &&
+ $as_echo "#define HAVE_AVFORMAT_AVIO_H 1" >>confdefs.h
+ 
+             if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
Index: pkgsrc/multimedia/xine-lib/patches/patch-m4_decoders.m4
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-m4_decoders.m4:1.1
--- /dev/null   Sat Jan  3 14:10:40 2026
+++ pkgsrc/multimedia/xine-lib/patches/patch-m4_decoders.m4     Sat Jan  3 14:10:39 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-m4_decoders.m4,v 1.1 2026/01/03 14:10:39 nia Exp $
+
+Fix shell portability.
+
+--- m4/decoders.m4.orig        2026-01-03 11:56:26.446210809 +0000
++++ m4/decoders.m4
+@@ -147,14 +147,14 @@ a52_init ();
+ #include <libavutil/avutil.h>
+ #include <libavcodec/avcodec.h>
+             ]],[[]])], [have_avutil_avcodec_h=yes], [have_avutil_avcodec_h=no])
+-            test x"$have_avutil_avcodec_h" == x"yes" && AC_DEFINE([HAVE_AVUTIL_AVCODEC_H],[1],
++            test x"$have_avutil_avcodec_h" = x"yes" && AC_DEFINE([HAVE_AVUTIL_AVCODEC_H],[1],
+                 [Define this if you have libavutil/avutil.h and libavcodec/avcodec.h.])
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <libavutil/avutil.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+             ]],[[]])], [have_avformat_avformat_h=yes], [have_avformat_avformat_h=no])
+-            test x"$have_avformat_avformat_h" == x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVFORMAT_H],[1],
++            test x"$have_avformat_avformat_h" = x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVFORMAT_H],[1],
+                 [Define this if you have libavformat/avformat.h.])
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <libavutil/avutil.h>
+@@ -162,7 +162,7 @@ a52_init ();
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+             ]],[[]])], [have_avformat_avio_h=yes], [have_avformat_avio_h=no])
+-            test x"$have_avformat_avio_h" == x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVIO_H],[1],
++            test x"$have_avformat_avio_h" = x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVIO_H],[1],
+                 [Define this if you have libavformat/avformat.h.])
+             if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
+                 AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])

Prev by Date: CVS commit: pkgsrc/databases/gnats
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/gnats
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index