pool/libgme
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 502822 from home:derselbst:anmp

Browse Source 
Update to 0.6.1:
 * "libgme-0.6.0-pkgconfig_path.patch" and "cve-2016-9957.patch"
   got fixed upstream
 * Following functions added to API (do we have to bump soversion?)
   - gme_tell_samples();
   - gme_seek_samples();

OBS-URL: https://build.opensuse.org/request/show/502822
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libgme?expand=0&rev=16
This commit is contained in:
Tomáš Chvátal
2017-06-10 19:52:46 +00:00
committed by Git OBS Bridge
parent 4526e3b58c
commit 13ebfc3cb5
6 changed files with 15 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cve-2016-9957.patch
View File

@@ -1,51 +0,0 @@
diff -rubB gme-old/Spc_Cpu.h gme/Spc_Cpu.h
Index: game-music-emu-0.6.0/gme/Spc_Cpu.h
===================================================================
--- game-music-emu-0.6.0.orig/gme/Spc_Cpu.h 2016-12-16 12:06:53.981779435 +0100
+++ game-music-emu-0.6.0/gme/Spc_Cpu.h 2016-12-16 12:09:35.995506135 +0100
@@ -76,8 +76,8 @@ Inc., 51 Franklin Street, Fifth Floor, B
// TODO: remove non-wrapping versions?
#define SPC_NO_SP_WRAPAROUND 0
-#define SET_SP( v ) (sp = ram + 0x101 + (v))
-#define GET_SP() (sp - 0x101 - ram)
+#define SET_SP( v ) (sp = ram + 0x101 + ((uint8_t) v))
+#define GET_SP() (uint8_t) (sp - 0x101 - ram)
#if SPC_NO_SP_WRAPAROUND
#define PUSH16( v ) (sp -= 2, SET_LE16( sp, v ))
@@ -485,7 +485,7 @@ loop:
case 0xAF: // MOV (X)+,A
WRITE_DP( 0, x, a + no_read_before_write );
- x++;
+ x = (uint8_t) (x + 1);
goto loop;
// 5. 8-BIT LOGIC OPERATION COMMANDS
@@ -808,7 +808,7 @@ loop:
unsigned temp = y * a;
a = (uint8_t) temp;
nz = ((temp >> 1) | temp) & 0x7F;
- y = temp >> 8;
+ y = (uint8_t) (temp >> 8);
nz |= y;
goto loop;
}
@@ -838,6 +838,7 @@ loop:
nz = (uint8_t) a;
a = (uint8_t) a;
+ y = (uint8_t) y;
goto loop;
}
@@ -1004,7 +1005,7 @@ loop:
case 0x7F: // RET1
temp = *sp;
SET_PC( GET_LE16( sp + 1 ) );
- sp += 3;
+ SET_SP(GET_SP() + 3);
goto set_psw;
case 0x8E: // POP PSW
POP( temp );

3
game-music-emu-0.6.0.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:506e81d0c61e1a26d503fbf5351503e0b31f9fbb374cb1f09979758b46a24987
size 170202

3
game-music-emu-0.6.1.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc11bea098072d540d4d52dfb252e76fc3d3af67ee2807da48fbd8dbda3fd321
size 171140

10
libgme-0.6.0-pkgconfig_path.patch
View File

@@ -1,10 +0,0 @@
Index: gme/CMakeLists.txt
===================================================================
--- gme/CMakeLists.txt.orig
+++ gme/CMakeLists.txt
@@ -159,4 +159,4 @@ install(TARGETS gme LIBRARY DESTINATION
ARCHIVE DESTINATION lib) # DLL platforms
install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)

10
libgme.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Jun 10 18:19:33 UTC 2017 - tom.mbrt@googlemail.com
- Update to 0.6.1:
* "libgme-0.6.0-pkgconfig_path.patch" and "cve-2016-9957.patch"
got fixed upstream
* Following functions added to API:
- gme_tell_samples();
- gme_seek_samples();
-------------------------------------------------------------------
Fri Dec 16 11:16:04 UTC 2016 - psimons@suse.com

9
libgme.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package libgme
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define soname 0
Name: libgme
Version: 0.6.0
Version: 0.6.1
Release: 0
Summary: Collection of video game music file emulators
License: LGPL-2.1+
@@ -26,9 +26,6 @@ Group: System/Libraries
Url: https://bitbucket.org/mpyne/game-music-emu/wiki/Home
Source0: https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-%{version}.tar.bz2
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM libgme-0.6.0-pkgconfig_path.patch http://code.google.com/p/game-music-emu/issues/detail?id=19 reddwarf@opensuse.org -- Fix .pc installation path
Patch0: libgme-0.6.0-pkgconfig_path.patch
Patch1: cve-2016-9957.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkg-config
@@ -75,8 +72,6 @@ which use libgme.
%prep
%setup -q -n game-music-emu-%{version}
%patch0
%patch1 -p1
sed -i 's/\r$//' changes.txt design.txt gme.txt license.txt readme.txt
%build