[arch-commits] Commit in scummvm/repos/community-x86_64 (6 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Wed Apr 22 14:15:12 UTC 2020


    Date: Wednesday, April 22, 2020 @ 14:15:11
  Author: svenstaro
Revision: 617651

archrelease: copy trunk to community-x86_64

Added:
  scummvm/repos/community-x86_64/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
    (from rev 617650, scummvm/trunk/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch)
  scummvm/repos/community-x86_64/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
    (from rev 617650, scummvm/trunk/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch)
  scummvm/repos/community-x86_64/PKGBUILD
    (from rev 617650, scummvm/trunk/PKGBUILD)
Deleted:
  scummvm/repos/community-x86_64/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
  scummvm/repos/community-x86_64/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
  scummvm/repos/community-x86_64/PKGBUILD

------------------------------------------------+
 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch |  102 +++++++++++------------
 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch |   50 +++++------
 PKGBUILD                                       |   84 +++++++++---------
 3 files changed, 118 insertions(+), 118 deletions(-)

Deleted: 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
===================================================================
--- 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch	2020-04-22 14:14:59 UTC (rev 617650)
+++ 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch	2020-04-22 14:15:11 UTC (rev 617651)
@@ -1,51 +0,0 @@
-commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5
-Author: D G Turner <digitall at scummvm.org>
-Date:   Tue Dec 17 04:21:04 2019 +0000
-
-    AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
-    
-    The previous fix did not work as the forbidden exception had no effect
-    since scummsys.h and thus forbidden.h had already been included prior
-    to the fluidsynth header being included. This also meant that undefining
-    the exception define after the header would have had no effect anyway.
-    
-    This new solution was suggest by eriktorbjorn on bug #11278 and should
-    avoid the need to add an exception which would persist over the entire
-    source file.
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a1524..f8c2412492 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -20,10 +20,16 @@
-  *
-  */
- 
--#include "common/scummsys.h"
-+#include "config.h"
- 
- #ifdef USE_FLUIDSYNTH
- 
-+// Fluidsynth v2.1+ uses printf in one of it's headers,
-+// include/fluidsynth/log.h around line 82 so need to include this
-+// prior scummsys.h inclusion and thus forbidden.h
-+#include <fluidsynth.h>
-+
-+#include "common/scummsys.h"
- #include "common/config-manager.h"
- #include "common/error.h"
- #include "common/system.h"
-@@ -35,13 +41,6 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
--// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
--// needed to allow compilation, as reported by eriktorbjorn on 20191215
--// This is in include/fluidsynth/log.h around line 82
--#define FORBIDDEN_SYMBOL_EXCEPTION_printf
--#include <fluidsynth.h>
--#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
--
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
- 	MidiChannel_MPU401 _midiChannels[16];

Copied: scummvm/repos/community-x86_64/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch (from rev 617650, scummvm/trunk/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch)
===================================================================
--- 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch	                        (rev 0)
+++ 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch	2020-04-22 14:15:11 UTC (rev 617651)
@@ -0,0 +1,51 @@
+commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5
+Author: D G Turner <digitall at scummvm.org>
+Date:   Tue Dec 17 04:21:04 2019 +0000
+
+    AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+    
+    The previous fix did not work as the forbidden exception had no effect
+    since scummsys.h and thus forbidden.h had already been included prior
+    to the fluidsynth header being included. This also meant that undefining
+    the exception define after the header would have had no effect anyway.
+    
+    This new solution was suggest by eriktorbjorn on bug #11278 and should
+    avoid the need to add an exception which would persist over the entire
+    source file.
+
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index 33a74a1524..f8c2412492 100644
+--- a/audio/softsynth/fluidsynth.cpp
++++ b/audio/softsynth/fluidsynth.cpp
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,13 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+-// needed to allow compilation, as reported by eriktorbjorn on 20191215
+-// This is in include/fluidsynth/log.h around line 82
+-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+-#include <fluidsynth.h>
+-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];

Deleted: 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
===================================================================
--- 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch	2020-04-22 14:14:59 UTC (rev 617650)
+++ 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch	2020-04-22 14:15:11 UTC (rev 617651)
@@ -1,25 +0,0 @@
-commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6
-Author: D G Turner <digitall at scummvm.org>
-Date:   Sun Dec 15 22:22:20 2019 +0000
-
-    AUDIO: Fix Compilation Against Fluidsynth v2.1+
-    
-    This is as reported by eriktorbjorn.
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 4034b2ffc3..33a74a1524 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -35,7 +35,12 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
-+// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
-+// needed to allow compilation, as reported by eriktorbjorn on 20191215
-+// This is in include/fluidsynth/log.h around line 82
-+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
- #include <fluidsynth.h>
-+#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
- 
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:

Copied: scummvm/repos/community-x86_64/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch (from rev 617650, scummvm/trunk/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch)
===================================================================
--- 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch	                        (rev 0)
+++ 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch	2020-04-22 14:15:11 UTC (rev 617651)
@@ -0,0 +1,25 @@
+commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6
+Author: D G Turner <digitall at scummvm.org>
+Date:   Sun Dec 15 22:22:20 2019 +0000
+
+    AUDIO: Fix Compilation Against Fluidsynth v2.1+
+    
+    This is as reported by eriktorbjorn.
+
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index 4034b2ffc3..33a74a1524 100644
+--- a/audio/softsynth/fluidsynth.cpp
++++ b/audio/softsynth/fluidsynth.cpp
+@@ -35,7 +35,12 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
++// needed to allow compilation, as reported by eriktorbjorn on 20191215
++// This is in include/fluidsynth/log.h around line 82
++#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+ #include <fluidsynth.h>
++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+ 
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-22 14:14:59 UTC (rev 617650)
+++ PKGBUILD	2020-04-22 14:15:11 UTC (rev 617651)
@@ -1,42 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: juergen <juergen at archlinux.org>
-# Contributor: Manolis Tzanidakis, Petter Gundersen
-
-pkgname=scummvm
-pkgver=2.1.1
-pkgrel=1
-pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=('x86_64')
-license=('GPL')
-url="http://www.scummvm.org/"
-depends=('libpng' 'libtheora' 'sdl2' 'sdl2_net' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
-         'libgl' 'glu' 'libjpeg-turbo' 'libmpeg2' 'curl' 'a52dec')
-makedepends=('mesa')
-source=("https://scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz"
-        68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
-        8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch)
-sha512sums=('ed4b3519f1ac099a1f939ebc1b8e339fb32bcd7259acd82c8fb18054625bf189d24fa0363eff6cbc2804d9ee74e8755c428ed95ccb091c4b820ad399a553fff3'
-            '5693442762d8a1bdeae2e7c9d63cb6809a90aef4e508aeb04a1c0dea0dcc573a0c62f415ec1b15d97e061aae561761220eae4d39a12362cd586667d6c9072fef'
-            'caebf9901b63bce5c98218c63c84da6d2ed60c384464fa2a996d057e295fde6efe96fafbe61bef9e19c0170bc04e82d707eb855f5cc82254308458e25c95132f')
-
-prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}"/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
-  patch -Np1 -i "${srcdir}"/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
-}
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure \
-    --enable-c++11 \
-    --enable-release \
-    --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
-}

Copied: scummvm/repos/community-x86_64/PKGBUILD (from rev 617650, scummvm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-22 14:15:11 UTC (rev 617651)
@@ -0,0 +1,42 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: juergen <juergen at archlinux.org>
+# Contributor: Manolis Tzanidakis, Petter Gundersen
+
+pkgname=scummvm
+pkgver=2.1.2
+pkgrel=1
+pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
+arch=('x86_64')
+license=('GPL')
+url="http://www.scummvm.org/"
+depends=('libpng' 'libtheora' 'sdl2' 'sdl2_net' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
+         'libgl' 'glu' 'libjpeg-turbo' 'libmpeg2' 'curl' 'a52dec')
+makedepends=('mesa')
+source=("https://scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz"
+        68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
+        8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch)
+sha512sums=('a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc'
+            '5693442762d8a1bdeae2e7c9d63cb6809a90aef4e508aeb04a1c0dea0dcc573a0c62f415ec1b15d97e061aae561761220eae4d39a12362cd586667d6c9072fef'
+            'caebf9901b63bce5c98218c63c84da6d2ed60c384464fa2a996d057e295fde6efe96fafbe61bef9e19c0170bc04e82d707eb855f5cc82254308458e25c95132f')
+
+prepare() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  patch -Np1 -i "${srcdir}"/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
+  patch -Np1 -i "${srcdir}"/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure \
+    --enable-c++11 \
+    --enable-release \
+    --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+}



More information about the arch-commits mailing list