Fix invalid ELF object error.

3 files changed, 55 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55803edb6ca6..0711f67dda56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,8 +4,8 @@ pkgbase = oss-git
 	url = http://developer.opensound.com/
 	arch = i686
 	arch = x86_64
+	arch = pentium4
 	license = GPL2
-	makedepends = gtk2
 	makedepends = git
 	source = oss::git://git.code.sourceforge.net/p/opensound/git
 	source = oss4_sys-libs_glibc-2.23_ossdetect_fix_git.patch
@@ -28,7 +28,7 @@ pkgbase = oss-git
 	sha512sums = a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6
 	sha512sums = f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df
 	sha512sums = 6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b
-	sha512sums = eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad
+	sha512sums = 5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db
 
 pkgname = oss-git
 	pkgdesc = Open Sound System UNIX audio architecture
diff --git a/PKGBUILD b/PKGBUILD
index 0085e5d4b206..ff93c889fc47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,10 +13,10 @@ pkgname=oss-git
 true && pkgname=(oss-git libflashsupport-oss-git)
 pkgver=7cf6b07
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 pentium4)
 url="http://developer.opensound.com/"
 license=(GPL2)
-makedepends=(gtk2 git)
+makedepends=(git)
 source=(oss::git://git.code.sourceforge.net/p/opensound/git
         oss4_sys-libs_glibc-2.23_ossdetect_fix_git.patch
         seawright.patch
@@ -37,8 +37,9 @@ sha512sums=('SKIP'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
             'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6'
             'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df'
-           '6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b'
-            'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad')
+            '6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b'
+            '5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db')
+
 
 pkgver() {
   cd "oss"
@@ -61,7 +62,7 @@ prepare() {
   # patch -p0 < "$srcdir/linux-4.6.patch"
   # - no longer required (from commit 891ddd)
   # patch -p0 < "$srcdir/linux-4.8-usercopy.patch"
-  patch -p0 < "$srcdir/ossvermagic.patch"
+  patch -p1 < "$srcdir/ossvermagic.patch"
   patch -p1 < "$srcdir/seawright.patch"
   patch -p1 < "$srcdir/galaxy.patch"
 
diff --git a/ossvermagic.patch b/ossvermagic.patch
index 9c20912401d7..a239e4905b72 100644
--- a/ossvermagic.patch
+++ b/ossvermagic.patch
@@ -1,12 +1,53 @@
---- os_cmd/Linux/ossvermagic/ossvermagic.c	2013-06-14 06:55:00.000000000 +0200
-+++ os_cmd/Linux/ossvermagic/ossvermagic.c	2013-11-14 18:42:23.910206071 +0100
-@@ -81,6 +81,8 @@
+diff --git a/os_cmd/Linux/ossvermagic/ossvermagic.c b/os_cmd/Linux/ossvermagic/ossvermagic.c
+index d0ca321..6ce36c8 100644
+--- a/os_cmd/Linux/ossvermagic/ossvermagic.c
++++ b/os_cmd/Linux/ossvermagic/ossvermagic.c
+@@ -70,6 +70,8 @@ find_vermagic (char *fname)
+   ok = ELF_LOAD_SYMTAB (fname, "vermagic", sym_callback);
    if (!ok)
      ok = ELF_LOAD_SYMTAB (fname, "__mod_vermagic", sym_callback);
-   if (!ok)
-+    ok = ELF_LOAD_SYMTAB (fname, "__UNIQUE_ID_vermagic0", sym_callback);
 +  if (!ok)
++    ok = ELF_LOAD_SYMTAB (fname, "__UNIQUE_ID_vermagic0", sym_callback);
+   if (!ok)
      ELF_LOAD_SYMTAB (fname, "__oss_compile_vermagic", sym_callback);
  }
+@@ -119,6 +121,24 @@ check_bzipped_module (char *fname)
+   unlink ("/tmp/oss.tmpmodule");
+ }
+ 
++static void
++check_xzipped_module (char *fname)
++{
++  char tmp[1024];
++
++  sprintf (tmp, "xzdec %s > /tmp/oss.tmpmodule", fname);
++  unlink ("/tmp/oss.tmpmodule");
++
++  if (system (tmp) != 0)
++    {
++      unlink ("/tmp/oss.tmpmodule");
++      return;
++    }
++
++  find_vermagic ("/tmp/oss.tmpmodule");
++  unlink ("/tmp/oss.tmpmodule");
++}
++
+ static void
+ scan_dir (char *dirname)
+ {
+@@ -168,6 +188,14 @@ scan_dir (char *dirname)
+ 	      continue;
+ 	    }
  
-
++	  p = tmp + strlen (tmp) - 3;	// Seek the .xz suffix
++	  if (strcmp (p, ".xz") == 0)
++	    {
++	      fname = tmp;
++	      check_xzipped_module (tmp);
++	      continue;
++	    }
++
+ 	  fname = tmp;
+ 	  find_vermagic (tmp);
+ 	}