Remove avcodec.patch (thanks @rando)

3 files changed, 4 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c21225e82c1..333e990cc79e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ultrastardx-git
 	pkgdesc = Free and open source karaoke game. (GIT)
-	pkgver = r949.16331ad4
+	pkgver = r955.b35bba82
 	pkgrel = 1
 	url = http://usdx.eu/
 	arch = i686
@@ -32,9 +32,7 @@ pkgbase = ultrastardx-git
 	provides = ultrastardx
 	conflicts = ultrastardx
 	source = git://github.com/UltraStar-Deluxe/USDX.git
-	source = avcodec.patch
 	sha256sums = SKIP
-	sha256sums = fbe1e5e887bc235fef71c6d0f6ff26b7c377bb92cbeecd6a81d6ecb354ade84f
 
 pkgname = ultrastardx-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e2e87f45856c..2c15835c8d65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Mitmischer
 
 pkgname=ultrastardx-git
-pkgver=r949.16331ad4
+pkgver=r955.b35bba82
 pkgrel=1
 pkgdesc='Free and open source karaoke game. (GIT)'
 arch=('i686' 'x86_64')
@@ -22,10 +22,9 @@ optdepends=('ultrastar-creator: Qt program to generate USDX songs'
 provides=('ultrastardx')
 conflicts=('ultrastardx')
 groups=('usdx')
-source=("git://github.com/UltraStar-Deluxe/USDX.git" "avcodec.patch")
+source=("git://github.com/UltraStar-Deluxe/USDX.git")
 
-sha256sums=('SKIP'
-            'fbe1e5e887bc235fef71c6d0f6ff26b7c377bb92cbeecd6a81d6ecb354ade84f')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/USDX"
@@ -34,7 +33,6 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/USDX"
-  patch -p1 -i "${srcdir}/avcodec.patch"
   ./autogen.sh
 }
 
diff --git a/avcodec.patch b/avcodec.patch
deleted file mode 100644
index 1e47a6be4f03..000000000000
--- a/avcodec.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/lib/ffmpeg-4.0/avcodec.pas b/src/lib/ffmpeg-4.0/avcodec.pas
-index e717744d..cef8b16e 100644
---- a/src/lib/ffmpeg-4.0/avcodec.pas
-+++ b/src/lib/ffmpeg-4.0/avcodec.pas
-@@ -84,7 +84,7 @@ const
- 
-   (* Supported version by this header *)
-   LIBAVCODEC_MAX_VERSION_MAJOR   = 58;
--  LIBAVCODEC_MAX_VERSION_MINOR   = 35;
-+  LIBAVCODEC_MAX_VERSION_MINOR   = 54;
-   LIBAVCODEC_MAX_VERSION_RELEASE = 100;
-   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
-                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
-diff --git a/src/lib/ffmpeg-4.0/avformat.pas b/src/lib/ffmpeg-4.0/avformat.pas
-index b1fcea54..b6609e1f 100644
---- a/src/lib/ffmpeg-4.0/avformat.pas
-+++ b/src/lib/ffmpeg-4.0/avformat.pas
-@@ -63,7 +63,7 @@ const
-    *)
-   (* Max. supported version by this header *)
-   LIBAVFORMAT_MAX_VERSION_MAJOR   = 58;
--  LIBAVFORMAT_MAX_VERSION_MINOR   = 20;
-+  LIBAVFORMAT_MAX_VERSION_MINOR   = 29;
-   LIBAVFORMAT_MAX_VERSION_RELEASE = 100;
-   LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
-                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
-diff --git a/src/lib/ffmpeg-4.0/avutil.pas b/src/lib/ffmpeg-4.0/avutil.pas
-index 2e5e64bd..506344e1 100644
---- a/src/lib/ffmpeg-4.0/avutil.pas
-+++ b/src/lib/ffmpeg-4.0/avutil.pas
-@@ -58,7 +58,7 @@ uses
- const
-   (* Max. supported version by this header *)
-   LIBAVUTIL_MAX_VERSION_MAJOR   = 56;
--  LIBAVUTIL_MAX_VERSION_MINOR   = 22;
-+  LIBAVUTIL_MAX_VERSION_MINOR   = 32;
-   LIBAVUTIL_MAX_VERSION_RELEASE = 100;
-   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
-                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-diff --git a/src/lib/ffmpeg-4.0/swresample.pas b/src/lib/ffmpeg-4.0/swresample.pas
-index aea02d36..87d30a9f 100644
---- a/src/lib/ffmpeg-4.0/swresample.pas
-+++ b/src/lib/ffmpeg-4.0/swresample.pas
-@@ -83,7 +83,7 @@ const
- 
-   (* Supported version by this header *)
-   LIBSWRESAMPLE_MAX_VERSION_MAJOR   = 3;
--  LIBSWRESAMPLE_MAX_VERSION_MINOR   = 3;
-+  LIBSWRESAMPLE_MAX_VERSION_MINOR   = 5;
-   LIBSWRESAMPLE_MAX_VERSION_RELEASE = 100;
-   LIBSWRESAMPLE_MAX_VERSION = (LIBSWRESAMPLE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
-                            (LIBSWRESAMPLE_MAX_VERSION_MINOR * VERSION_MINOR) +
-diff --git a/src/lib/ffmpeg-4.0/swscale.pas b/src/lib/ffmpeg-4.0/swscale.pas
-index 59391758..55c74c6c 100644
---- a/src/lib/ffmpeg-4.0/swscale.pas
-+++ b/src/lib/ffmpeg-4.0/swscale.pas
-@@ -77,7 +77,7 @@ const
- 
-   (* Max. supported version by this header *)
-   LIBSWSCALE_MAX_VERSION_MAJOR   =  5;
--  LIBSWSCALE_MAX_VERSION_MINOR   =  3;
-+  LIBSWSCALE_MAX_VERSION_MINOR   =  5;
-   LIBSWSCALE_MAX_VERSION_RELEASE =  100;
-   LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
-                            (LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) +