Mercurial > sdl-ios-xcode

diff SDL.spec.in @ 1133:609c060fd2a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails: To: SDL Developers <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Mon, 30 May 2005 23:29:04 +0200 Subject: [SDL] Mac OS X Video Drivers [patch] I've updated/added the Carbon and X11 video drivers to the Mac OS X port of SDL 1.2 (the CVS version), and made the Cocoa driver and runtime *optional*. The default is still Cocoa, and the "Quartz" driver. But you can now also use "toolbox" for Carbon, and "x11" for running with Apple's (or other) X11 server: export SDL_VIDEODRIVER=x11 export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib It also checks if the frameworks are available, by a: #include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h> (this should make it configure on plain Darwin as well?) Here are the new configure targets: --enable-video-cocoa use Cocoa/Quartz video driver default=yes --enable-video-carbon use Carbon/QuickDraw video driver default=yes --enable-video-x11 use X11 video driver default=no ./configure --enable-video-cocoa --enable-video-carbon --enable-video-x11 \ --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib The Carbon version is just an updated version of the old SDL driver for Mac OS 9, and could probably be improved... (but it does work, including the Carbon version of SDLmain) If you disable cocoa, you can run with -framework Carbon only, and the C version of SDL_main.c. And if you disable carbon too, you can still use the X11 version which doesn't require SDLmain. I updated the DrawSprocket version, but did not include it. (no blitters or VRAM GWorlds etc. available on OS X anyway) Besides for Mac OS 9, I don't think there's any use for it ? And note that any performance on Mac OS X equals OpenGL anyway... You can get "fair" software SDL results on captured CG displays, but for decent frame rates you need to be using GL for rendering. Finally, here is the patch itself: http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch --anders PS. It says "video", but as usual it applies to mouse/keyboard too. ------ To: A list for developers using the SDL library <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Sun, 4 Sep 2005 10:02:15 +0200 Subject: [SDL] Updated Mac patch Updated the previous Mac patch to disable Carbon by default. Also "fixed" the SDL.spec again, so that it builds on Darwin. http://www.algonet.se/~afb/SDL-1.2.9-mac.patch Also applied fine to SDL12 CVS, when I tried it.
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 08 Sep 2005 06:16:14 +0000
parents 5fb02068b648
children 19418e4422cb
line wrap: on
line diff
--- a/SDL.spec.in	Thu Aug 25 20:31:58 2005 +0000
+++ b/SDL.spec.in	Thu Sep 08 06:16:14 2005 +0000
@@ -1,18 +1,16 @@
-%define name @PACKAGE@
-%define version @VERSION@
-%define release 1
-
 Summary: Simple DirectMedia Layer
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0: %{name}-%{version}.tar.gz
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
+Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 URL: http://www.libsdl.org/
-Copyright: LGPL
+License: LGPL
 Group: System Environment/Libraries
-BuildRoot: /var/tmp/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Prefix: %{_prefix}
+%ifos linux
 Provides: libSDL-1.1.so.0
+%endif
 
 %description
 This is the Simple DirectMedia Layer, a generic API that provides low
@@ -22,7 +20,7 @@
 %package devel
 Summary: Libraries, includes and more to develop SDL applications.
 Group: Development/Libraries
-Requires: %{name}
+Requires: %{name} = %{version}
 
 %description devel
 This is the Simple DirectMedia Layer, a generic API that provides low
@@ -34,40 +32,62 @@
 
 
 %prep
-rm -rf ${RPM_BUILD_ROOT}
-
 %setup -q 
 
 %build
+%ifos linux
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-video-svga --disable-video-ggi --disable-video-aalib --disable-debug --enable-dlopen --enable-esd-shared --enable-arts-shared
+%else
+%configure --disable-debug --enable-dlopen
+%endif
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%ifos linux
 make install prefix=$RPM_BUILD_ROOT/%{prefix}
 ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{prefix}/lib/libSDL-1.1.so.0
+%else
+%makeinstall
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%ifnos darwin
+%define __defattr %defattr(-,root,root)
+%define __soext so
+%else
+%define __defattr %defattr(-,root,wheel)
+%define __soext dylib
+%endif
+
 %files
-%defattr(-,root,root)
+%{__defattr}
 %doc README-SDL.txt COPYING CREDITS BUGS
-%{prefix}/lib/lib*.so.*
+%ifnos darwin
+%{_libdir}/lib*.%{__soext}.*
+%else
+%{_libdir}/lib*.*.%{__soext}
+%endif
 
 %files devel
 %defattr(-,root,root)
 %doc README README-SDL.txt COPYING CREDITS BUGS WhatsNew docs.html
 %doc docs/index.html docs/html
-%{prefix}/bin/*-config
-%{prefix}/lib/lib*.a
-%{prefix}/lib/lib*.la
-%{prefix}/lib/lib*.so
-%{prefix}/include/SDL/
-%{prefix}/man/man3/*
-%{prefix}/share/aclocal/*
+%{_bindir}/*-config
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
+%{_libdir}/lib*.%{__soext}
+%dir %{_includedir}/SDL
+%{_includedir}/SDL/*.h
+%{_mandir}/man3/*
+%{_datadir}/aclocal/*
 
 %changelog
+* Mon Jan 03 2004 Anders Bjorklund <afb@algonet.se>
+- Added support for Darwin, updated spec file
+
 * Wed Jan 19 2000 Sam Lantinga <slouken@libsdl.org>
 - Re-integrated spec file into SDL distribution
 - 'name' and 'version' come from configure