rpms/mame/devel mame-systempa.patch, NONE, 1.1 .cvsignore, 1.88, 1.89 mame.spec, 1.106, 1.107 sources, 1.88, 1.89 mame-optflags.patch, 1.1, NONE mame-systemlibs.patch, 1.8, NONE

Sun Jul 5 22:04:17 CEST 2015

Author: belegdol

Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21315

Modified Files:
	.cvsignore mame.spec sources 
Added Files:
	mame-systempa.patch 
Removed Files:
	mame-optflags.patch mame-systemlibs.patch 
Log Message:
* Sun Jul 05 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.163-1
- Updated to 0.163
- Cleaned up the spec file further
- Dropped upstreamed patches
- Patched to use system PortAudio


mame-systempa.patch:
 makefile                 |    5 +++++
 scripts/genie.lua        |    5 +++++
 scripts/src/3rdparty.lua |    6 ++++++
 3 files changed, 16 insertions(+)

--- NEW FILE mame-systempa.patch ---
diff -up mame-0.163/makefile.systempa mame-0.163/makefile
--- mame-0.163/makefile.systempa	2015-07-05 10:40:43.933061000 +0200
+++ mame-0.163/makefile	2015-07-05 11:09:47.122619628 +0200
@@ -60,6 +60,7 @@
 # USE_SYSTEM_LIB_LUA = 1
 # USE_SYSTEM_LIB_SQLITE3 = 1
 # USE_SYSTEM_LIB_PORTMIDI = 1
+# USE_SYSTEM_LIB_PORTAUDIO = 1
 
 # MESA_INSTALL_ROOT = /opt/mesa
 # SDL_INSTALL_ROOT = /opt/sdl2
@@ -336,6 +337,10 @@ ifndef USE_SYSTEM_LIB_PORTMIDI
 PARAMS += --with-bundled-portmidi
 endif
 
+ifndef USE_SYSTEM_LIB_PORTAUDIO
+PARAMS += --with-bundled-portaudio
+endif
+
 #-------------------------------------------------
 # distribution may change things
 #-------------------------------------------------
diff -up mame-0.163/scripts/genie.lua.systempa mame-0.163/scripts/genie.lua
--- mame-0.163/scripts/genie.lua.systempa	2015-07-05 11:11:18.522715238 +0200
+++ mame-0.163/scripts/genie.lua	2015-07-05 11:11:45.958044104 +0200
@@ -129,6 +129,11 @@ newoption {
 }
 
 newoption {
+    trigger = 'with-bundled-portaudio',
+    description = 'Build bundled PortAudio library',
+}
+
+newoption {
 	trigger = "distro",
 	description = "Choose distribution",
 	allowed = {
diff -up mame-0.163/scripts/src/3rdparty.lua.systempa mame-0.163/scripts/src/3rdparty.lua
--- mame-0.163/scripts/src/3rdparty.lua.systempa	2015-07-05 11:17:42.332171148 +0200
+++ mame-0.163/scripts/src/3rdparty.lua	2015-07-05 11:15:46.737835996 +0200
@@ -650,6 +650,7 @@ end
 -- PortAudio library objects
 --------------------------------------------------
 
+if _OPTIONS["with-bundled-portaudio"] then
 project "portaudio"
 	uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
 	kind "StaticLib"
@@ -775,6 +776,11 @@ project "portaudio"
 			"-Wshadow"
 		}
 	end
+else
+links {
+	"portaudio",
+}
+end
 		
 --------------------------------------------------
 -- UnitTest++ library objects


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	8 Jun 2015 05:36:01 -0000	1.88
+++ .cvsignore	5 Jul 2015 20:04:17 -0000	1.89
@@ -1,2 +1,2 @@
-mame0162s.exe
+mame0163s.exe
 whatsnew.zip


Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mame.spec	8 Jun 2015 06:11:45 -0000	1.106
+++ mame.spec	5 Jul 2015 20:04:17 -0000	1.107
@@ -5,7 +5,7 @@
 %bcond_with debug
 %bcond_with simd
 
-%global baseversion 162
+%global baseversion 163
 
 # work around low memory on the RPM Fusion builder
 %bcond_without lowmem
@@ -14,12 +14,7 @@
 %endif
 
 Name:           mame
-%if 0%{?sourceupdate}
-Version:        0.%{baseversion}u%{sourceupdate}
-%else
 Version:        0.%{baseversion}
-%endif
-
 Release:        1%{?svnrelease}%{?dist}
 Summary:        Multiple Arcade Machine Emulator
 
@@ -28,8 +23,7 @@
 Source0:        http://mamedev.org/downloader.php?file=%{name}0%{baseversion}/%{name}0%{baseversion}s.exe
 Source100:      whatsnew.zip
 Patch0:         %{name}-fortify.patch
-Patch1:         %{name}-optflags.patch
-Patch2:         %{name}-systemlibs.patch
+Patch1:         %{name}-systempa.patch
 
 BuildRequires:  expat-devel
 BuildRequires:  flac-devel
@@ -39,9 +33,8 @@
 BuildRequires:  lua-devel >= 5.3.0
 %endif
 #BuildRequires:  mongoose-devel
-%if !0%{?svn}
 BuildRequires:  p7zip
-%endif
+BuildRequires:  portaudio-devel
 BuildRequires:  portmidi-devel
 BuildRequires:  python
 BuildRequires:  qt-devel
@@ -132,8 +125,7 @@
     -o -wholename ./makefile \) -exec sed -i 's@\r@@' {} \;
 
 %patch0 -p1 -b .fortify
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .systemlibs
+%patch1 -p1 -b .systempa
 
 # Fix encoding
 #for whatsnew in whatsnew_0162.txt; do
@@ -187,11 +179,13 @@
 %if 0%{?fedora} >= 22
 MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 VERBOSE=1 USE_SYSTEM_LIB_EXPAT=1 \
     USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 \
-    USE_SYSTEM_LIB_LUA=1 USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1"
+    USE_SYSTEM_LIB_LUA=1 USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1 \
+    USE_SYSTEM_LIB_PORTAUDIO=1 SDL_INI_PATH=%{_sysconfdir}/%{name};"
 %else
 MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 VERBOSE=1 USE_SYSTEM_LIB_EXPAT=1 \
     USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 \
-    USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1"
+    USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1 \
+    USE_SYSTEM_LIB_PORTAUDIO=1 SDL_INI_PATH=%{_sysconfdir}/%{name};"
 %endif
 
 #only use assembly on supported architectures
@@ -199,9 +193,6 @@
 MAME_FLAGS="$MAME_FLAGS NOASM=1"
 %endif
 
-#genie makes passing INI_PATH as define impossible
-sed -i 's@"$HOME/.APP_NAME;.;ini"@"%{_sysconfdir}/%{name};"@' src/osd/sdl/sdlmain.c
-
 %if %{with ldplayer}
 make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
@@ -321,6 +312,12 @@
 
 
 %changelog
+* Sun Jul 05 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.163-1
+- Updated to 0.163
+- Cleaned up the spec file further
+- Dropped upstreamed patches
+- Patched to use system PortAudio
+
 * Sun Jun 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.162-1
 - Updated to 0.162
 - Adapted to the new build system


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	8 Jun 2015 05:36:01 -0000	1.88
+++ sources	5 Jul 2015 20:04:17 -0000	1.89
@@ -1,2 +1,2 @@
-027efe41a3d799f8016f7508cf30ff3d  mame0162s.exe
-4caaa10bf96663fab37c93609900897d  whatsnew.zip
+ef24ea10296f506f7959c09dd545a03e  mame0163s.exe
+e61e111998d3e7f575e9414006a0eb77  whatsnew.zip


--- mame-optflags.patch DELETED ---


--- mame-systemlibs.patch DELETED ---
