Fix build with gcc10

gcc10 uses -fno-common by default.

Details here:
https://gcc.gnu.org/gcc-10/porting_to.html

3 files changed, 41 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daf329d06bf3..071d5a20eed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xine-lib-hg
 	pkgdesc = A multimedia playback engine (mercurial version)
-	pkgver = 1.2.9.r14420.88e48552a162
+	pkgver = 1.2.10.r14730.91312aae00d0
 	pkgrel = 1
 	url = https://www.xine-project.org/
 	arch = x86_64
@@ -53,7 +53,9 @@ pkgbase = xine-lib-hg
 	provides = xine-lib
 	conflicts = xine-lib
 	source = hg+http://hg.code.sf.net/p/xine/xine-lib-1.2
+	source = 010-xine-lib-hg-gcc10-fix.patch
 	sha256sums = SKIP
+	sha256sums = b5a42d16d83058e6e13adc384bf12d546f3f7072ece48b234ef415ec192a4457
 
 pkgname = xine-lib-hg
 
diff --git a/010-xine-lib-hg-gcc10-fix.patch b/010-xine-lib-hg-gcc10-fix.patch
new file mode 100644
index 000000000000..28a3014de445
--- /dev/null
+++ b/010-xine-lib-hg-gcc10-fix.patch
@@ -0,0 +1,16 @@
+diff -r 91312aae00d0 src/libreal/real_common.h
+--- a/src/libreal/real_common.h	Sat May 09 23:18:35 2020 +0200
++++ b/src/libreal/real_common.h	Fri May 15 01:25:51 2020 +0000
+@@ -75,10 +75,10 @@
+ 			 const char *const codec_name,
+ 			 const char *const codec_alternate);
+ 
+-const decoder_info_t dec_info_realvideo;
++extern const decoder_info_t dec_info_realvideo;
+ void *init_realvdec (xine_t *xine, const void *data);
+ 
+-const decoder_info_t dec_info_realaudio;
++extern const decoder_info_t dec_info_realaudio;
+ void *init_realadec (xine_t *xine, const void *data);
+ 
+ #endif
diff --git a/PKGBUILD b/PKGBUILD
index 9f008b8d49b5..5ccf6157853f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=xine-lib-hg
-pkgver=1.2.9.r14420.88e48552a162
+pkgver=1.2.10.r14730.91312aae00d0
 pkgrel=1
 pkgdesc='A multimedia playback engine (mercurial version)'
 arch=('x86_64')
@@ -33,30 +33,36 @@ optdepends=('imagemagick: for using the imagemagick plugin'
             'gdk-pixbuf2: for using the gdk-pixbuf plugin')
 provides=('xine-lib')
 conflicts=('xine-lib')
-source=('hg+http://hg.code.sf.net/p/xine/xine-lib-1.2')
-sha256sums=('SKIP')
+source=('hg+http://hg.code.sf.net/p/xine/xine-lib-1.2'
+        '010-xine-lib-hg-gcc10-fix.patch')
+sha256sums=('SKIP'
+            'b5a42d16d83058e6e13adc384bf12d546f3f7072ece48b234ef415ec192a4457')
+
+prepare() {
+    patch -d xine-lib-1.2 -Np1 -i"${srcdir}/010-xine-lib-hg-gcc10-fix.patch"
+}
 
 pkgver() {
-    cd xine-lib-1.2
-    
+    local _number
+    local _revision
+    local _hash
+    local _version
     local _version_major
     local _version_minor
     local _version_sub
     local _version_patch
-    local _version
-    local _number
-    _version_major="$(grep '^XINE_VERSION_MAJOR=' version.sh | sed 's/.*=//')"
-    _version_minor="$(grep '^XINE_VERSION_MINOR=' version.sh | sed 's/.*=//')"
-    _version_sub="$(  grep '^XINE_VERSION_SUB='   version.sh | sed 's/.*=//')"
-    _version_patch="$(grep '^XINE_VERSION_PATCH=' version.sh | sed 's/.*=//')"
+    _version_major="$(grep '^XINE_VERSION_MAJOR=' xine-lib-1.2/version.sh | sed 's/.*=//')"
+    _version_minor="$(grep '^XINE_VERSION_MINOR=' xine-lib-1.2/version.sh | sed 's/.*=//')"
+    _version_sub="$(  grep '^XINE_VERSION_SUB='   xine-lib-1.2/version.sh | sed 's/.*=//')"
+    _version_patch="$(grep '^XINE_VERSION_PATCH=' xine-lib-1.2/version.sh | sed 's/.*=//')"
     _version="$_version_major"
-    
     for _number in "$_version_minor" "$_version_sub" "$_version_patch"
     do
         [ -n "$_number" ] && _version+=".${_number}"
     done
-    
-    printf '%s.r%s.%s' "$_version" "$(hg identify -n)" "$(hg identify -i)"
+    _revision="$(hg -R xine-lib-1.2 identify -n)"
+    _hash="$(hg -R xine-lib-1.2 identify -i)"
+    printf '%s.r%s.%s' "$_version" "${_revision%+}" "${_hash%+}"
 }
 
 build() {
@@ -72,6 +78,5 @@ build() {
 }
 
 package() {
-    cd xine-lib-1.2
-    make DESTDIR="$pkgdir" install
+    make -C xine-lib-1.2 DESTDIR="$pkgdir" install
 }