- rediff patches

diff --git a/x32.patch b/x32.patch
index e1711f06b70c2b29b936b629313d887370191326..f660b15c6a412bd6d3e67d9a99d7c7fc1ed15e59 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,17 +1,7 @@
---- xine-lib-1.2.3/src/post/planar/noise.c~    2012-02-05 20:17:02.000000000 +0100
-+++ xine-lib-1.2.3/src/post/planar/noise.c     2015-03-09 19:48:57.305807701 +0100
-@@ -37,7 +37,7 @@
- #  include <libavutil/mem.h>
- #endif
- 
--#ifdef ARCH_X86_64
-+#if defined(ARCH_X86_64) && !defined(__ILP32__)
- #  define REG_a  "rax"
- #  define intarch_t int64_t
- #else
---- xine-lib-1.2.8/src/post/goom/convolve_fx.c.orig    2017-02-21 12:13:13.000000000 +0100
-+++ xine-lib-1.2.8/src/post/goom/convolve_fx.c 2017-07-10 18:13:03.046198557 +0200
-@@ -152,7 +152,7 @@
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/src/post/goom/convolve_fx.c xine-lib-1.2.8/src/post/goom/convolve_fx.c
+--- xine-lib-1.2.8.org/src/post/goom/convolve_fx.c     2017-02-21 12:13:13.000000000 +0100
++++ xine-lib-1.2.8/src/post/goom/convolve_fx.c 2022-02-14 00:14:02.757106126 +0100
+@@ -152,7 +152,7 @@ static void create_output_with_brightnes
      yprime += c;
  
  #if defined(HAVE_MMX) && !defined(__sun)
@@ -20,3 +10,15 @@
      /* 64-bit os version. */
      __asm__ __volatile__
        ("\n\t pxor  %%mm7,  %%mm7"  /* mm7 = 0   */
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/src/post/planar/noise.c xine-lib-1.2.8/src/post/planar/noise.c
+--- xine-lib-1.2.8.org/src/post/planar/noise.c 2017-02-21 12:13:13.000000000 +0100
++++ xine-lib-1.2.8/src/post/planar/noise.c     2022-02-14 00:14:02.757106126 +0100
+@@ -31,7 +31,7 @@
+ #include <math.h>
+ #include <pthread.h>
+ 
+-#ifdef ARCH_X86_64
++#if defined(ARCH_X86_64) && !defined(__ILP32__)
+ #  define REG_a  "rax"
+ #  define intarch_t int64_t
+ #else

diff --git a/xine-lib-sh.patch b/xine-lib-sh.patch
index aced979eed1257946bce9a5896a7bb3f63a39d2b..587e3b79308e4c06d436124d898fbcc04d236be8 100644 (file)
--- a/xine-lib-sh.patch
+++ b/xine-lib-sh.patch
@@ -1,6 +1,7 @@
---- xine-lib-1.1.16.3/configure.ac.orig        2009-05-02 00:04:29.569438975 +0000
-+++ xine-lib-1.1.16.3/configure.ac     2009-05-02 00:06:52.962751969 +0000
-@@ -982,9 +982,9 @@
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/configure.ac xine-lib-1.2.8/configure.ac
+--- xine-lib-1.2.8.org/configure.ac    2022-02-14 00:14:00.030435681 +0100
++++ xine-lib-1.2.8/configure.ac        2022-02-14 00:14:00.377102828 +0100
+@@ -1000,9 +1000,9 @@ t q
  b
  :q
  q"
@@ -11,9 +12,9 @@
 +x_lib_location=$(ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"*  "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"*  2>/dev/null | sed -e \"${soname_script}\")
  AC_DEFINE_UNQUOTED([LIBXV_SO],  "${x_lib_location:-libXv.$acl_cv_shlibext}",  [The soname of libXv, needed for dlopen()])
  
- dnl _FILE_OFFSET_BITS   (AC_SYS_LARGEFILE; ac_cv_sys_file_offset_bits)
-@@ -2512,7 +2512,7 @@
- 
+ dnl Does X11 need XLockDisplay () to prevent deadlocks?
+@@ -1245,7 +1245,7 @@ OBJCFLAGS="$UNIVERSAL_CFLAGS $miscflags
+ dnl Some informations about xine-lib compilation for xine-config
  XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
  XINE_BUILD_OS="`uname -s -r -m`"
 -XINE_BUILD_DATE="`date "+%a %d %b %Y %T"`"

diff --git a/xine-lib-vdpau-hooks.patch b/xine-lib-vdpau-hooks.patch
index 5f41824c10fc495ccff2343bde0b61db2805346a..79773e1f8dc41d92e5dfb035e63bf1a0a5006726 100644 (file)
--- a/xine-lib-vdpau-hooks.patch
+++ b/xine-lib-vdpau-hooks.patch
@@ -1,7 +1,7 @@
-diff -r 23f700befc6c src/video_out/Makefile.am
---- a/src/video_out/Makefile.am        Sun Feb 20 23:38:32 2011 +0100
-+++ b/src/video_out/Makefile.am        Wed Mar 16 14:17:05 2011 +0100
-@@ -40,6 +40,9 @@
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/src/video_out/Makefile.am xine-lib-1.2.8/src/video_out/Makefile.am
+--- xine-lib-1.2.8.org/src/video_out/Makefile.am       2017-02-21 12:13:13.000000000 +0100
++++ xine-lib-1.2.8/src/video_out/Makefile.am   2022-02-14 00:14:01.953771680 +0100
+@@ -48,6 +48,9 @@ endif
  
  if ENABLE_VDPAU
  vdpau_module = xineplug_vo_out_vdpau.la
@@ -10,9 +10,10 @@ diff -r 23f700befc6c src/video_out/Makefile.am
 +xine_include_HEADERS = video_out_vdpau.h
  endif
  
- if ENABLE_XCB
---- xine-lib-1.2.8/src/video_out/video_out_vdpau.c.orig        2017-02-21 12:13:13.000000000 +0100
-+++ xine-lib-1.2.8/src/video_out/video_out_vdpau.c     2017-07-08 07:46:55.935788912 +0200
+ if ENABLE_VAAPI
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/src/video_out/video_out_vdpau.c xine-lib-1.2.8/src/video_out/video_out_vdpau.c
+--- xine-lib-1.2.8.org/src/video_out/video_out_vdpau.c 2017-02-21 12:13:13.000000000 +0100
++++ xine-lib-1.2.8/src/video_out/video_out_vdpau.c     2022-02-14 00:14:01.953771680 +0100
 @@ -51,6 +51,7 @@
  #include <vdpau/vdpau_x11.h>
  #include "accel_vdpau.h"
@@ -21,7 +22,7 @@ diff -r 23f700befc6c src/video_out/Makefile.am
  
  
  #define NUM_FRAMES_BACK 1
-@@ -2637,6 +2638,7 @@
+@@ -2637,6 +2638,7 @@ static vo_driver_t *vdpau_open_plugin (v
  {
    vdpau_class_t       *class   = (vdpau_class_t *) class_gen;
    x11_visual_t        *visual  = (x11_visual_t *) visual_gen;
@@ -29,7 +30,7 @@ diff -r 23f700befc6c src/video_out/Makefile.am
    vdpau_driver_t      *this;
    config_values_t      *config  = class->xine->config;
    int i;
-@@ -2713,15 +2715,22 @@
+@@ -2713,15 +2715,22 @@ static vo_driver_t *vdpau_open_plugin (v
    this->ovl_src_rect.x0 = 0;
    this->ovl_src_rect.y0 = 0;
  
@@ -61,7 +62,7 @@ diff -r 23f700befc6c src/video_out/Makefile.am
    }
    st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_GET_ERROR_STRING , (void*)&vdp_get_error_string );
    if ( vdpau_init_error( st, "Can't get GET_ERROR_STRING proc address !!", &this->vo_driver, 0 ) )
-@@ -2929,6 +2938,22 @@
+@@ -2929,6 +2938,22 @@ static vo_driver_t *vdpau_open_plugin (v
    if ( vdpau_init_error( st, "Can't get PREEMPTION_CALLBACK_REGISTER proc address !!", &this->vo_driver, 1 ) )
      return NULL;
  
@@ -84,9 +85,9 @@ diff -r 23f700befc6c src/video_out/Makefile.am
    st = vdp_preemption_callback_register(vdp_device, &vdp_preemption_callback, (void*)this);
    if ( vdpau_init_error( st, "Can't register preemption callback !!", &this->vo_driver, 1 ) )
      return NULL;
-diff -r 23f700befc6c src/video_out/video_out_vdpau.h
---- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/video_out/video_out_vdpau.h  Wed Mar 16 14:17:05 2011 +0100
+diff -urNp -x '*.orig' xine-lib-1.2.8.org/src/video_out/video_out_vdpau.h xine-lib-1.2.8/src/video_out/video_out_vdpau.h
+--- xine-lib-1.2.8.org/src/video_out/video_out_vdpau.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.2.8/src/video_out/video_out_vdpau.h     2022-02-14 00:14:01.953771680 +0100
 @@ -0,0 +1,58 @@
 +/*
 + * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle; remove-trailing-space on;