[arch-commits] Commit in mupen64plus/trunk (4 files)

[Daniel Bermond]

    Date: Sunday, November 22, 2020 @ 13:10:40
  Author: dbermond
Revision: 759030

upgpkg: mupen64plus 2.5-16

- fix FS#68430 (build fix for gcc10)
- add missing .so library
- update PIE patch
- update dependencies
- remove MANDIR (dropped by upstream a very long time ago)
- remove i686 stuff
- cosmetic changes

Added:
  mupen64plus/trunk/010-mupen64plus-ui-console-pie.patch
    (from rev 759029, mupen64plus/trunk/ui-console-pic.patch)
  mupen64plus/trunk/020-mupen64plus-core-gcc10-fix.patch
Modified:
  mupen64plus/trunk/PKGBUILD
Deleted:
  mupen64plus/trunk/ui-console-pic.patch

--------------------------------------+
 010-mupen64plus-ui-console-pie.patch |   11 +++++++
 020-mupen64plus-core-gcc10-fix.patch |   10 +++++++
 PKGBUILD                             |   46 ++++++++++++++++-----------------
 ui-console-pic.patch                 |   12 --------
 4 files changed, 44 insertions(+), 35 deletions(-)

Copied: mupen64plus/trunk/010-mupen64plus-ui-console-pie.patch (from rev 759029, mupen64plus/trunk/ui-console-pic.patch)
===================================================================
--- 010-mupen64plus-ui-console-pie.patch	                        (rev 0)
+++ 010-mupen64plus-ui-console-pie.patch	2020-11-22 13:10:40 UTC (rev 759030)
@@ -0,0 +1,11 @@
+--- a/source/mupen64plus-ui-console/projects/unix/Makefile
++++ b/source/mupen64plus-ui-console/projects/unix/Makefile
+@@ -84,8 +84,6 @@ endif
+ ifeq ($(PIE), 1)
+   CFLAGS += -fPIE
+   LDFLAGS += -pie
+-else
+-  CFLAGS += -fno-PIE
+ endif
+ 
+ # set special flags per-system

Added: 020-mupen64plus-core-gcc10-fix.patch
===================================================================
--- 020-mupen64plus-core-gcc10-fix.patch	                        (rev 0)
+++ 020-mupen64plus-core-gcc10-fix.patch	2020-11-22 13:10:40 UTC (rev 759030)
@@ -0,0 +1,10 @@
+--- a/source/mupen64plus-core/src/main/workqueue.h
++++ b/source/mupen64plus-core/src/main/workqueue.h
+@@ -27,7 +27,6 @@
+ 
+ struct work_struct;
+ 
+-struct work_struct *work;
+ typedef void (*work_func_t)(struct work_struct *work);
+ struct work_struct {
+     work_func_t func;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-22 13:10:06 UTC (rev 759029)
+++ PKGBUILD	2020-11-22 13:10:40 UTC (rev 759030)
@@ -1,4 +1,5 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer : Daniel Bermond <dbermond at archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Laurent Carlier <lordheavym at gmail.com>
 # Contributor: Allan McRae <allan at archlinux.org>
@@ -6,39 +7,38 @@
 
 pkgname=mupen64plus
 pkgver=2.5
-pkgrel=15
+pkgrel=16
 pkgdesc='Nintendo64 Emulator'
 arch=('x86_64')
 url='https://github.com/mupen64plus/mupen64plus-core'
 license=('GPL')
-depends=('glu' 'libsamplerate' 'libpng' 'sdl' 'freetype2' 'boost-libs')
-makedepends=('mesa' 'boost')
-source=("https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5/mupen64plus-bundle-src-${pkgver}.tar.gz"
-        'ui-console-pic.patch')
+depends=('boost-libs' 'freetype2' 'glu' 'libgl' 'libpng' 'libsamplerate' 'sdl'
+         'zlib' 'hicolor-icon-theme')
+makedepends=('boost' 'mesa')
+source=("https://github.com/mupen64plus/mupen64plus-core/releases/download/${pkgver}/mupen64plus-bundle-src-${pkgver}.tar.gz"
+        '010-mupen64plus-ui-console-pie.patch'
+        '020-mupen64plus-core-gcc10-fix.patch')
 sha256sums=('9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66'
-            'bb4784de177aaa4c0b4f5d07b14ae020f3b47e6aa524df65366ac00eb169ee8f')
+            '0b674779949ca90db9f156b56dd9d7be9847354f5b07ec73aa3a89dde79d6b6d'
+            'f84f262bcf2b748ccded4443735caba92926241f9238f545a621009f6ae64ef7')
 
 prepare() {
-  cd mupen64plus-bundle-src-$pkgver
-  patch -p1 -i ../ui-console-pic.patch
+    patch -d "mupen64plus-bundle-src-${pkgver}" -Np1 -i "${srcdir}/010-mupen64plus-ui-console-pie.patch"
+    patch -d "mupen64plus-bundle-src-${pkgver}" -Np1 -i "${srcdir}/020-mupen64plus-core-gcc10-fix.patch"
 }
 
 build() {
-  cd mupen64plus-bundle-src-${pkgver}
-
-  if [[ $CARCH = 'i686' ]]; then
-    export CFLAGS="${CFLAGS/-fno-plt/}"
-    export CXXFLAGS="${CXXFLAGS/-fno-plt/}"
-  fi
-
-  sh m64p_build.sh
+    cd "mupen64plus-bundle-src-${pkgver}"
+    ./m64p_build.sh
 }
 
 package() {
-  cd mupen64plus-bundle-src-$pkgver
-  
-  # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid
-  ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man' LDCONFIG='true'
+    cd "mupen64plus-bundle-src-${pkgver}"
+    
+    # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid
+    ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true'
+    
+    local _sover
+    _sover="$(find "${pkgdir}/usr/lib" -type f -name 'libmupen64plus.so.*.*.*' | sed 's/^.*\.so\.//')"
+    ln -s "libmupen64plus.so.${_sover}" "${pkgdir}/usr/lib/libmupen64plus.so"
 }
-
-# vim: ts=2:sw=2:et

Deleted: ui-console-pic.patch
===================================================================
--- ui-console-pic.patch	2020-11-22 13:10:06 UTC (rev 759029)
+++ ui-console-pic.patch	2020-11-22 13:10:40 UTC (rev 759030)
@@ -1,12 +0,0 @@
-diff --git a/source/mupen64plus-ui-console/projects/unix/Makefile b/source/mupen64plus-ui-console/projects/unix/Makefile
-index a4a05e3..199f27f 100755
---- a/source/mupen64plus-ui-console/projects/unix/Makefile
-+++ b/source/mupen64plus-ui-console/projects/unix/Makefile
-@@ -90,6 +90,7 @@ endif
- 
- # set special flags per-system
- ifeq ($(OS), LINUX)
-+  CFLAGS += -fPIC
-   LDLIBS += -ldl
- endif
- ifeq ($(OS), OSX)