- rediffed patches, fixed if for rpm.org

diff --git a/mplayer-check-byteswap.patch b/mplayer-check-byteswap.patch
index 76e6029b39e482e5446d2ae154d03950d5aa2784..2b4ac6bb5b98ec6484121dd46234e09a8ca2a129 100644 (file)
--- a/mplayer-check-byteswap.patch
+++ b/mplayer-check-byteswap.patch
@@ -1,6 +1,6 @@
---- MPlayer-1.0rc2/configure~  2008-02-07 13:58:05.000000000 +0200
-+++ MPlayer-1.0rc2/configure   2008-02-07 13:58:10.395099351 +0200
-@@ -2998,6 +2998,21 @@
+--- MPlayer-1.4/configure.orig 2021-04-30 07:15:02.624028723 +0200
++++ MPlayer-1.4/configure      2021-04-30 07:15:53.046668447 +0200
+@@ -3955,6 +3955,21 @@ fi
  echores "$_alloca"
  
  
@@ -19,11 +19,11 @@
 +echores "$_byteswap"
 +
 +
- echocheck "mman.h"
- cat > $TMPC << EOF
- #include <sys/types.h>
-@@ -8568,6 +8568,7 @@
- $def_alsa_asoundlib_h
+ echocheck "fastmemcpy"
+ if test "$_fastmemcpy" = yes ; then
+   def_fastmemcpy='#define CONFIG_FASTMEMCPY 1'
+@@ -8902,6 +8917,7 @@ $def_sys_uio_h
+ $def_alloca_h
  $def_altivec_h
  $def_malloc_h
 +$def_byteswap_h

diff --git a/mplayer-ldflags.patch b/mplayer-ldflags.patch
index 64f88fbdc0b8b14a2c7060f248ee758560ac9cc2..4dd33728cd0a2cab9e0f3c62dd5fcf6d90e4cfd0 100644 (file)
--- a/mplayer-ldflags.patch
+++ b/mplayer-ldflags.patch
@@ -1,6 +1,6 @@
---- mplayer-r32669/configure.orig      2012-03-03 23:31:28.000000000 +0000
-+++ mplayer-r32669/configure   2012-03-10 12:19:51.000000000 +0000
-@@ -593,7 +593,8 @@
+--- MPlayer-1.4/configure.orig 2018-12-15 16:38:24.000000000 +0100
++++ MPlayer-1.4/configure      2021-04-30 07:14:05.527706286 +0200
+@@ -595,7 +595,8 @@ Advanced options:
  
  Use these options if autodetection fails:
    --extra-cflags=FLAGS        extra CFLAGS
@@ -10,17 +10,17 @@
    --extra-libs=FLAGS          extra linker flags
    --extra-libs-mplayer=FLAGS  extra linker flags for MPlayer
    --extra-libs-mencoder=FLAGS extra linker flags for MEncoder
-@@ -929,6 +930,9 @@
+@@ -930,6 +931,9 @@ for ac_option do
    --extra-cflags=*)
-     extra_cflags=$(echo $ac_option | cut -d '=' -f 2-)
+     extra_cflags=$(option_value $ac_option)
      ;;
 +  --real-ldflags=*)
 +    real_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
 +    ;;
    --extra-ldflags=*)
-     extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
+     extra_ldflags=$(option_value $ac_option)
      ;;
-@@ -7590,7 +7594,7 @@
+@@ -8024,7 +8028,7 @@ echores "$_crash_debug"
  
  echocheck "compiler support for noexecstack"
  if cflag_check -Wl,-z,noexecstack ; then
@@ -29,7 +29,7 @@
    echores "yes"
  else
    echores "no"
-@@ -8320,6 +8320,8 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
+@@ -8420,6 +8424,8 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
  CFLAGS_STACKREALIGN      = $cflags_stackrealign
  CFLAGS_SVGALIB_HELPER    = $cflags_svgalib_helper
  
@@ -38,18 +38,18 @@
  EXTRALIBS          = $ld_static $extra_ldflags $timer_libs $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
---- mplayer-r32669/Makefile.orig       2010-10-27 19:55:45.000000000 +0200
-+++ mplayer-r32669/Makefile    2010-11-30 09:24:31.973414915 +0100
-@@ -853,7 +853,7 @@
+--- MPlayer-1.4/Makefile.orig  2018-04-11 12:26:39.000000000 +0200
++++ MPlayer-1.4/Makefile       2021-04-30 07:14:33.362496825 +0200
+@@ -744,7 +744,7 @@ mencoder$(EXESUF): EXTRALIBS += $(EXTRAL
  mplayer$(EXESUF): $(MPLAYER_DEPS)
  mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
  mencoder$(EXESUF) mplayer$(EXESUF):
 -      $(CC) -o $@ $^ $(EXTRALIBS)
 +      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
  
- codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-       $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
-@@ -1072,7 +1072,7 @@
+ codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
+ codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
+@@ -1028,7 +1028,7 @@ mplayer-nomain.o: mplayer.c
  TOOLS/netstream$(EXESUF): TOOLS/netstream.c
  TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
  TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)

diff --git a/mplayer.spec b/mplayer.spec
index 27a0a76c1f6eebe0ccdadeea6b879f3e4d050010..0bc0fcd8cb0d0e720b89014afffff132daf0ad1b 100644 (file)
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -100,7 +100,7 @@
 %undefine      with_crystalhd
 %endif
 
-%if %{_lib} != "lib"
+%if "%{_lib}" != "lib"
 %define                binsuf  %(lib=%{_lib} ; echo ${lib#lib})
 %else
 %ifarch        %{ix86} ppc sparc sparcv9 s390