Bumped

- Now uses static ffmpeg (2.7.7) and ffms2 (2.20) due the x262 is a old project and not update since 2015. is not compatible with newer ffmpeg/ffms2 versions

2 files changed, 58 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 054028566a33..8437d1e36653 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,18 +2,23 @@ pkgbase = x262-git
 	pkgdesc = x264 with MPEG-2 video support (GIT version)
 	pkgver = 0.142.2633.bb887aa
 	pkgrel = 1
-	url = http://git.videolan.org/?p=x262.git
-	arch = i686
+	url = https://www.videolan.org/developers/x262.html
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = yasm
-	depends = glibc
-	depends = ffms2
+	depends = zlib
+	depends = bzip2
+	depends = xz
+	depends = sdl
 	provides = x262
 	conflicts = x262
-	source = git://git.videolan.org/x262.git
-	sha1sums = SKIP
+	source = git+https://git.videolan.org/git/x262.git
+	source = git+https://github.com/ffmpeg/ffmpeg.git#tag=n2.7.7
+	source = git+https://github.com/FFMS/ffms2.git#tag=2.20
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = x262-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6de75bc27f8e..def8b21bfde4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,26 +5,65 @@ pkgname=x262-git
 pkgver=0.142.2633.bb887aa
 pkgrel=1
 pkgdesc="x264 with MPEG-2 video support (GIT version)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
-depends=('glibc' 'ffms2')
-makedepends=('git' 'yasm')
-url="http://git.videolan.org/?p=x262.git"
-source=('git://git.videolan.org/x262.git')
+depends=('zlib'
+         'bzip2'
+         'xz'
+         'sdl'
+         )
+makedepends=('git'
+             'yasm'
+             )
+url="https://www.videolan.org/developers/x262.html"
+source=('git+https://git.videolan.org/git/x262.git'
+        'git+https://github.com/ffmpeg/ffmpeg.git#tag=n2.7.7'
+        'git+https://github.com/FFMS/ffms2.git#tag=2.20')
 provides=('x262')
 conflicts=('x262')
-sha1sums=('SKIP')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            )
 
 pkgver() {
   cd x262
   echo "$(sh version.sh | grep 'X264_POINTVER' | cut -d '"' -f2 | tr M m | tr ' ' .)"
 }
 
+prepare() {
+  mkdir -p build-{ffmpeg,ffms2}
+}
+
 build() {
-  cd x262
+  msg2 "Build FFmpeg"
+  cd "${srcdir}/build-ffmpeg"
+  ../ffmpeg/configure \
+    --prefix="${srcdir}/fakeroot" \
+    --disable-{network,{encod,mux}ers,hwaccels,{in,out}devs,debug,doc,vdpau,vaapi,programs} \
+    --enable-pic \
+    --enable-gpl
+
+  make install-libs install-headers
+
+  export PKG_CONFIG_LIBDIR="${srcdir}/fakeroot/lib/pkgconfig"
+  export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:/usr/lib/pkgconfig"
+
+  msg2 "Build FFmpegsource"
+  cd "${srcdir}/build-ffms2"
+  (cd "${srcdir}/ffms2"; mkdir -p src/config; autoreconf -vfi)
+  ../ffms2/configure \
+    --prefix="${srcdir}/fakeroot" \
+    --enable-shared=no
+
+  make install-libLTLIBRARIES install-pkgconfigDATA install-includeHEADERS
+
+  msg2 "Build x262"
+  cd "${srcdir}/x262"
   ./configure \
     --prefix=/usr \
-    --disable-lsmash
+    --disable-lsmash \
+    --enable-pic
 
   make
 }