diff --git a/fix-non-x86-build.diff b/fix-non-x86-build.diff deleted file mode 100644 index 890de9c..0000000 --- a/fix-non-x86-build.diff +++ /dev/null @@ -1,9 +0,0 @@ -Index: src/post/Makefile.am -=================================================================== ---- src/post/Makefile.am.orig 2018-01-27 13:29:10.028095109 +0200 -+++ src/post/Makefile.am 2018-01-27 13:34:02.946718905 +0200 -@@ -1,3 +1,3 @@ - include $(top_srcdir)/misc/Makefile.common - --SUBDIRS = planar goom visualizations mosaico deinterlace audio -+SUBDIRS = planar goom visualizations mosaico audio diff --git a/xine-lib.changes b/xine-lib.changes index 2800d52..8763630 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 6 10:51:20 UTC 2019 - schwab@suse.de + +- fix-non-x86-build.diff: remove + ------------------------------------------------------------------- Sat Dec 29 12:53:21 UTC 2018 - davejplater@gmail.com diff --git a/xine-lib.spec b/xine-lib.spec index 1d64fab..cd5e56b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,7 @@ # # spec file for package xine-lib # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -138,7 +138,6 @@ Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch # PATCH allow ffmpeg in openSUSE versions that have ffmpeg and still use the crippled tar ball to build with ffmpeg3. Patch2: xine-lib-without-ffmpeg.patch -Patch3: fix-non-x86-build.diff # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch # This should be fixed upstream, but this patch will not work for them. @@ -596,9 +595,6 @@ rm -rf src/combined/ffmpeg configure #%%patch5 %endif %endif -%ifnarch %ix86 x86_64 -%patch3 -%endif %patch4 %patch6 %patch8 -p1