SPECS: xmame.spec - sdl and x11 bconds added - added relax linker ...

[wrobell]

Author: wrobell                      Date: Tue Jun  5 21:00:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sdl and x11 bconds added
- added relax linker flags to build on ppc
- rel. 0.2

---- Files affected:
SPECS:
   xmame.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/xmame.spec
diff -u SPECS/xmame.spec:1.66 SPECS/xmame.spec:1.67
--- SPECS/xmame.spec:1.66	Sun Jun  3 17:36:40 2007
+++ SPECS/xmame.spec	Tue Jun  5 22:59:57 2007
@@ -1,8 +1,10 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	svga	# don't build svga version
-%bcond_without	qt	# don't build qtmame
+%bcond_without	svga	# don't build with svga display support
+%bcond_without	qt		# don't build qtmame
+%bcond_without	x11		# don't build with x11 display support
+%bcond_without	sdl		# don't build with sdl display support
 #
 %define		qtmame		qtmame
 %define		qtmame_ver	2.0.6
@@ -13,7 +15,7 @@
 Summary(pt_BR.UTF-8):	Emulador de Arcades X-Mame
 Name:		xmame
 Version:	0.106
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Applications/Emulators
 #Source0Download:	http://x.mame.net/xmame-doc-7.html
@@ -29,8 +31,8 @@
 Source7:	http://x.mame.net/download/%{name}-doc.pdf
 # Source7-md5:	f4a7b59d020ce35decd03b67639639a2
 URL:		http://x.mame.net/
-BuildRequires:	SDL-devel
-BuildRequires:	xorg-lib-libX11-devel
+%{?with_sdl:BuildRequires:	SDL-devel}
+%{?with_x11:BuildRequires:	xorg-lib-libX11-devel}
 BuildRequires:	alsa-driver-devel >= 0.9
 BuildRequires:	artsc-devel
 BuildRequires:	automake
@@ -265,12 +267,12 @@
 cd ..
 %endif
 
+%if %{with sdl}
 %{__make} -f makefile.unix \
-	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
 	DISPLAY_METHOD=SDL \
 	SOUND_ESOUND=1 \
 	SOUND_ALSA=1 \
@@ -278,13 +280,14 @@
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
 	#XMAME_NET=1
+%endif
 
+%if %{with x11}
 %{__make} -f makefile.unix \
-	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
 	X11LIB="-L/usr/X11R6/%{_lib}" \
 	DISPLAY_METHOD=x11 \
 	SOUND_ESOUND=1 \
@@ -293,14 +296,14 @@
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
 	#XMAME_NET=1
+%endif
 
 %if %{with svga}
 %{__make} -f makefile.unix \
-	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
 	DISPLAY_METHOD=svgalib \
 	SOUND_ESOUND=1 \
 	SOUND_ALSA=1 \
@@ -310,11 +313,13 @@
 	#XMAME_NET=1
 %endif
 
+%if %{with sdl}
 %{__make} -f makefile.unix \
+	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
 	DISPLAY_METHOD=SDL \
 	SOUND_ESOUND=1 \
 	SOUND_ALSA=1 \
@@ -322,14 +327,17 @@
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
 	#XMAME_NET=1
+%endif
 
-%if %{with svga}
+%if %{with x11}
 %{__make} -f makefile.unix \
+	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
-	DISPLAY_METHOD=svgalib \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
+	X11LIB="-L/usr/X11R6/%{_lib}" \
+	DISPLAY_METHOD=x11 \
 	SOUND_ESOUND=1 \
 	SOUND_ALSA=1 \
 	SOUND_ARTS_TEIRA=1 \
@@ -338,19 +346,21 @@
 	#XMAME_NET=1
 %endif
 
+%if %{with svga}
 %{__make} -f makefile.unix \
+	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
-	CC="%{__cc}" \
-	LD="%{__cc} %{rpmldflags}" \
-	X11LIB="-L/usr/X11R6/%{_lib}" \
-	DISPLAY_METHOD=x11 \
+	CC="%{__cc} %{rpmcflags}" \
+	LD="%{__cc} %{rpmldflags} -Wl,-s,--relax" \
+	DISPLAY_METHOD=svgalib \
 	SOUND_ESOUND=1 \
 	SOUND_ALSA=1 \
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
 	#XMAME_NET=1
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -358,16 +368,22 @@
 	$RPM_BUILD_ROOT%{_datadir}/games/%{name}/{cab,rc} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_datadir}/qtmame
-install xmame.SDL $RPM_BUILD_ROOT%{_bindir}
 
 %if %{with svga}
 install xmame.svgalib $RPM_BUILD_ROOT%{_bindir}
 install xmess.svgalib $RPM_BUILD_ROOT%{_bindir}
 %endif
 
+%if %{with x11}
 install xmame.x11 $RPM_BUILD_ROOT%{_bindir}
 install xmess.x11 $RPM_BUILD_ROOT%{_bindir}
+%endif
+
+%if %{with sdl}
+install xmame.SDL $RPM_BUILD_ROOT%{_bindir}
 install xmess.SDL $RPM_BUILD_ROOT%{_bindir}
+%endif
+
 install contrib/tools/xmame-screensaver $RPM_BUILD_ROOT%{_bindir}
 cp -R src/unix/cab/ $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 
@@ -397,10 +413,12 @@
 %{_datadir}/games/%{name}
 %{_pixmapsdir}/xmame.png
 
+%if %{with sdl}
 %files SDL
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}.SDL
 %{_desktopdir}/%{name}-SDL.desktop
+%endif
 
 %if %{with svga}
 %files svgalib
@@ -408,10 +426,12 @@
 %attr(755,root,root) %{_bindir}/%{name}.svgalib
 %endif
 
+%if %{with x11}
 %files x11
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}.x11
 %{_desktopdir}/%{name}-x11.desktop
+%endif
 
 %files screensaver
 %defattr(644,root,root,755)
@@ -447,6 +467,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2007/06/05 20:59:57  wrobell
+- sdl and x11 bconds added
+- added relax linker flags to build on ppc
+- rel. 0.2
+
 Revision 1.66  2007/06/03 15:36:40  wrobell
 - use modularized X
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xmame.spec?r1=1.66&r2=1.67&f=u