- rediff patches, rel 2

diff --git a/libx264-alpha.patch b/libx264-alpha.patch
index 007b709c88d81a948a6feffb0a27e64625e87554..5350c55b874e46503514456373cde14ec5923f96 100644 (file)
--- a/libx264-alpha.patch
+++ b/libx264-alpha.patch
@@ -1,7 +1,7 @@
 --- x264-snapshot-20110327-2245/configure.orig 2011-03-27 22:45:05.000000000 +0200
 +++ x264-snapshot-20110327-2245/configure      2011-03-28 11:15:16.384948894 +0200
 @@ -529,6 +529,9 @@
-             AS="${AS-${cross_prefix}gcc}"
+             AS="${AS-${CC}}"
          fi
          ;;
 +    alpha*)

diff --git a/libx264.spec b/libx264.spec
index 5108a0e3add1c155276ead8fe1cfeb60a1c971c2..ff8bf94e2bc5a2376bf97521f69decbff159f5ce 100644 (file)
--- a/libx264.spec
+++ b/libx264.spec
@@ -8,7 +8,7 @@
 %undefine      with_asm
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                snap    20191217
 %define                snaph   2245
 Summary:       H264 encoder library

diff --git a/x32.patch b/x32.patch
index 2633dfde2ceb4a7418b229f1657171f496e80cb5..7d6fbf2590597e5fc82d609f993f479c6c9d38ea 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -18,7 +18,7 @@
 -        [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
 +        [ $compiler = GNU ] && CFLAGS="$CFLAGS" && LDFLAGS="$LDFLAGS"
          if [ "$SYS" = MACOSX ]; then
-             ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+             ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
              if cc_check '' "-arch x86_64"; then
 @@ -641,7 +641,14 @@
                  RCFLAGS="--target=pe-x86-64 $RCFLAGS"