CVS commit: pkgsrc/multimedia/xine-lib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/xine-lib
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Fri, 2 Dec 2022 15:06:22 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec  2 15:06:22 UTC 2022

Modified Files:
        pkgsrc/multimedia/xine-lib: Makefile Makefile.common distinfo
        pkgsrc/multimedia/xine-lib/patches: patch-ag patch-src-post-planar-eq.c
            patch-src-post-planar-noise.c patch-src_video__dec_dav1d.c
Removed Files:
        pkgsrc/multimedia/xine-lib/patches: patch-fa

Log Message:
xine-lib: Restore dummy patch.

While here remove obsolete patches, including disabling MMX on SunOS, as it
appears to work fine now.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/multimedia/xine-lib/Makefile.common
cvs rdiff -u -r1.119 -r1.120 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/xine-lib/patches/patch-ag
cvs rdiff -u -r1.2 -r0 pkgsrc/multimedia/xine-lib/patches/patch-fa
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c
cvs rdiff -u -r1.1 -r1.2 \
    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.188 pkgsrc/multimedia/xine-lib/Makefile:1.189
--- pkgsrc/multimedia/xine-lib/Makefile:1.188   Wed Nov 23 16:20:48 2022
+++ pkgsrc/multimedia/xine-lib/Makefile Fri Dec  2 15:06:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.188 2022/11/23 16:20:48 adam Exp $
+# $NetBSD: Makefile,v 1.189 2022/12/02 15:06:22 jperkin Exp $
 
 PKGREVISION= 11
 .include "Makefile.common"
@@ -46,7 +46,7 @@ PLIST.oss=    yes
 .  endif
 .endif
 
-CPPFLAGS.SunOS+=       -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
+CPPFLAGS.SunOS+=       -D__u32=uint32_t -DHAVE_SYSI86
 LDFLAGS.SunOS+=                -lresolv
 
 # xv video output seems to be broken. Make sure another gets used instead.

Index: pkgsrc/multimedia/xine-lib/Makefile.common
diff -u pkgsrc/multimedia/xine-lib/Makefile.common:1.94 pkgsrc/multimedia/xine-lib/Makefile.common:1.95
--- pkgsrc/multimedia/xine-lib/Makefile.common:1.94     Sun Oct  9 07:45:00 2022
+++ pkgsrc/multimedia/xine-lib/Makefile.common  Fri Dec  2 15:06:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.94 2022/10/09 07:45:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.95 2022/12/02 15:06:22 jperkin Exp $
 #
 # used by audio/xine-alsa/Makefile
 # used by audio/xine-pulse/Makefile
@@ -45,10 +45,7 @@ PKGSRC_MAKE_ENV+=    "mkdir_p"="mkdir -p"
 
 pre-configure:
        ${TOUCH} ${WRKSRC}/lib/dummy.c
-       cd ${WRKSRC} && aclocal -I m4
-       cd ${WRKSRC} && automake -Wnone
-       cd ${WRKSRC} && autoheader
-       cd ${WRKSRC} && autoconf
+       cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.119 pkgsrc/multimedia/xine-lib/distinfo:1.120
--- pkgsrc/multimedia/xine-lib/distinfo:1.119   Sun Apr 10 16:47:32 2022
+++ pkgsrc/multimedia/xine-lib/distinfo Fri Dec  2 15:06:22 2022
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.119 2022/04/10 16:47:32 nia Exp $
+$NetBSD: distinfo,v 1.120 2022/12/02 15:06:22 jperkin 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
-SHA1 (patch-ag) = ef924c08b4d1d0dbc48f619d69b608c9d0def9fe
+SHA1 (patch-ag) = 82b9464f57f93e84be1d9cf60315a9b3e1cd3812
 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) = d59b517c966eb3f7935ab704525ed9e510d8bc17
@@ -18,14 +17,14 @@ SHA1 (patch-src-post-mosaico-mosaico.c) 
 SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4
 SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3
 SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad
-SHA1 (patch-src-post-planar-eq.c) = 9ad80656f4a9c21651d889c3a5b5c709e5ecea83
+SHA1 (patch-src-post-planar-eq.c) = 938983f4bb7c0f9db1befed3d4d2da8bfba8360b
 SHA1 (patch-src-post-planar-eq2.c) = 7711ea2c3b8ede9adf9b54f7b95f4458ffed852b
 SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
-SHA1 (patch-src-post-planar-noise.c) = db5ba28ae527995084ce3ad65c52867209d4b13f
+SHA1 (patch-src-post-planar-noise.c) = 284ed49ae621f18c62f91420230aa8e109f77541
 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) = b2228106e3eecb6d1695038fead0e5d9f5b4746a
+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/patches/patch-ag
diff -u pkgsrc/multimedia/xine-lib/patches/patch-ag:1.30 pkgsrc/multimedia/xine-lib/patches/patch-ag:1.31
--- pkgsrc/multimedia/xine-lib/patches/patch-ag:1.30    Tue Nov 13 11:10:41 2018
+++ pkgsrc/multimedia/xine-lib/patches/patch-ag Fri Dec  2 15:06:22 2022
@@ -1,8 +1,10 @@
-$NetBSD: patch-ag,v 1.30 2018/11/13 11:10:41 markd Exp $
+$NetBSD: patch-ag,v 1.31 2022/12/02 15:06:22 jperkin Exp $
 
---- configure.ac.orig  2018-01-11 12:49:46.000000000 +0000
+Ensure lib contains symbols.
+
+--- configure.ac.orig  2022-03-06 16:31:23.000000000 +0000
 +++ configure.ac
-@@ -468,7 +468,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+@@ -473,7 +473,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
  CC_ATTRIBUTE_ALIGNED
  
  CC_ATTRIBUTE_VISIBILITY([protected],
@@ -12,3 +14,11 @@ $NetBSD: patch-ag,v 1.30 2018/11/13 11:1
                          [CC_ATTRIBUTE_VISIBILITY([default], [visibility_export="default"])])
  CC_ATTRIBUTE_VISIBILITY([internal])
  
+@@ -1187,6 +1188,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp],
+ 
+ AC_FUNC_FSEEKO
+ 
++AC_LIBOBJ(dummy)
+ AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strcasestr strlcat strlcpy strndup strpbrk strsep strtok_r swab timegm unsetenv memmem])
+ 
+ AC_LIBSOURCE([hstrerror.c])

Index: pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
diff -u pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c:1.5 pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c:1.6
--- pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c:1.5   Thu Apr  2 15:52:46 2020
+++ pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq.c       Fri Dec  2 15:06:22 2022
@@ -1,20 +1,9 @@
-$NetBSD: patch-src-post-planar-eq.c,v 1.5 2020/04/02 15:52:46 nia Exp $
+$NetBSD: patch-src-post-planar-eq.c,v 1.6 2022/12/02 15:06:22 jperkin Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
-Disable MMX sections on SunOS.
-
 --- src/post/planar/eq.c.orig  2019-12-13 20:47:50.000000000 +0000
 +++ src/post/planar/eq.c
-@@ -33,7 +33,7 @@
- #include <pthread.h>
- 
- 
--#if defined(ARCH_X86)
-+#if defined(ARCH_X86) && !defined(__sun)
- 
- #if defined(ARCH_X86_64)
- #  define MEM1(reg) "(%"reg")"
 @@ -155,9 +155,11 @@ typedef struct eq_parameters_s {
   * description of params struct
   */
@@ -29,12 +18,3 @@ Disable MMX sections on SunOS.
              "contrast" )
  END_PARAM_DESCR( param_descr )
  
-@@ -360,7 +362,7 @@ static post_plugin_t *eq_open_plugin(pos
-   (void)audio_target;
- 
-   process = process_C;
--#if defined(ARCH_X86)
-+#if defined(ARCH_X86) && !defined(__sun)
-   if( xine_mm_accel() & MM_ACCEL_X86_MMX )
-     process = process_MMX;
- #endif

Index: pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c
diff -u pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c:1.6 pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c:1.7
--- pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c:1.6        Thu Apr  2 15:52:46 2020
+++ pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-noise.c    Fri Dec  2 15:06:22 2022
@@ -1,9 +1,7 @@
-$NetBSD: patch-src-post-planar-noise.c,v 1.6 2020/04/02 15:52:46 nia Exp $
+$NetBSD: patch-src-post-planar-noise.c,v 1.7 2022/12/02 15:06:22 jperkin Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
-Disable MMX sections on SunOS.
-
 --- src/post/planar/noise.c.orig       2019-12-13 20:47:50.000000000 +0000
 +++ src/post/planar/noise.c
 @@ -220,15 +220,20 @@ static const char *const enum_quality[] 
@@ -32,21 +30,3 @@ Disable MMX sections on SunOS.
      "Mix random noise with a (semi)regular pattern" )
  END_PARAM_DESCR( param_descr )
  
-@@ -372,7 +377,7 @@ static int noise_draw(vo_frame_t *frame,
-               frame->width * 2, frame->height, &this->params[0]);
-     }
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) && !defined(__sun)
-     if (xine_mm_accel() & MM_ACCEL_X86_MMX)
-         __asm__ __volatile__ ("emms\n\t");
-     if (xine_mm_accel() & MM_ACCEL_X86_MMXEXT)
-@@ -447,7 +452,7 @@ static post_plugin_t *noise_open_plugin(
- 
-     this->params[0].lineNoise = lineNoise_C;
-     this->params[0].lineNoiseAvg = lineNoiseAvg_C;
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) && !defined(__sun)
-     if (xine_mm_accel() & MM_ACCEL_X86_MMX) {
-         this->params[0].lineNoise = lineNoise_MMX;
-         this->params[0].lineNoiseAvg = lineNoiseAvg_MMX;

Index: pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c
diff -u pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c:1.1 pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c:1.2
--- pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c:1.1 Sun Apr  3 14:32:31 2022
+++ pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c     Fri Dec  2 15:06:22 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_video__dec_dav1d.c,v 1.1 2022/04/03 14:32:31 wiz Exp $
+$NetBSD: patch-src_video__dec_dav1d.c,v 1.2 2022/12/02 15:06:22 jperkin Exp $
 
 dav1d 1.0.0 compatibility from upstream.
 
---- src/video_dec/dav1d.c.orig 2020-11-19 10:30:37.000000000 +0000
+--- src/video_dec/dav1d.c.orig 2022-03-06 16:31:24.000000000 +0000
 +++ src/video_dec/dav1d.c
-@@ -537,11 +544,17 @@ static video_decoder_t *_open_plugin(vid
+@@ -544,11 +544,17 @@ static video_decoder_t *_open_plugin(vid
  
    /* multithreading */
    ncpu = xine_cpu_count();

Prev by Date: CVS commit: pkgsrc/databases/mysql80-server
Next by Date: CVS commit: pkgsrc/sysutils/xfce4-verve-plugin
Previous by Thread: CVS commit: pkgsrc/databases/mysql80-server
Next by Thread: CVS commit: pkgsrc/sysutils/xfce4-verve-plugin
Indexes:

Home | Main Index | Thread Index | Old Index