- noobjc patch - fixes for recent ac/am - OBJC macros cannot be used

  conditionally, so disable darwin files to not require gcc-objc
  (also removed darwin-related chunk from ac25x patch)

Changed files:
    SDL-ac25x.patch -> 1.3
    SDL-noobjc.patch -> 1.1
    SDL.spec -> 1.96

diff --git a/SDL-ac25x.patch b/SDL-ac25x.patch
index 8385f1d3b5626ae1007ba1fd4419c6aa8644e866..19e4289d09ed0843a5decd0b0a507283fb2e8c97 100644 (file)
--- a/SDL-ac25x.patch
+++ b/SDL-ac25x.patch
@@ -1,6 +1,6 @@
 diff -Nru SDL-1.2.4.orig/configure.in SDL-1.2.4/configure.in
---- SDL-1.2.4.orig/configure.in        Sun Apr 14 01:57:24 2002
-+++ SDL-1.2.4/configure.in     Wed Jul 31 10:04:28 2002
+--- SDL-1.2.5.orig/configure.in        Sun Apr 14 01:57:24 2002
++++ SDL-1.2.5/configure.in     Wed Jul 31 10:04:28 2002
 @@ -1414,6 +1414,7 @@
      fi
  }
@@ -9,11 +9,3 @@ diff -Nru SDL-1.2.4.orig/configure.in SDL-1.2.4/configure.in
  case "$target" in
      *-*-linux*)
          ARCH=linux
-@@ -2416,7 +2417,6 @@
-         OBJCDEPMODE="$CCDEPMODE"
-         AC_SUBST(OBJC)
-         AC_SUBST(OBJCFLAGS)
--        AC_SUBST(OBJCDEPMODE)
-         ;;
- esac
- 

diff --git a/SDL-noobjc.patch b/SDL-noobjc.patch
new file mode 100644 (file)
index 0000000..2ffa3e4
--- /dev/null
+++ b/SDL-noobjc.patch
@@ -0,0 +1,47 @@
+--- SDL-1.2.5/src/main/Makefile.am.orig        Sun May 19 22:06:01 2002
++++ SDL-1.2.5/src/main/Makefile.am     Sun Oct 13 21:04:54 2002
+@@ -14,15 +14,11 @@
+ # Build a separate library containing the main() entry point.
+ lib_LIBRARIES = libSDLmain.a
+ 
+-if TARGET_MACOSX
+-MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
+-else
+ if TARGET_QTOPIA
+ MAINLIB_ARCH_SRCS = SDL_Qtopia_main.cc
+ else
+ MAINLIB_ARCH_SRCS = SDL_main.c
+ endif
+-endif
+ libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS)
+ 
+ # Build an internal library of any special app setup functions
+--- SDL-1.2.5/configure.in.orig        Sun Oct 13 20:59:37 2002
++++ SDL-1.2.5/configure.in     Sun Oct 13 21:06:35 2002
+@@ -2548,18 +2549,6 @@
+ CXXFLAGS="$CFLAGS"
+ 
+ 
+-# Check for darwin at the very end and set up the Objective C compiler
+-# We do this here so that we get the full CFLAGS into OBJCFLAGS
+-case "$target" in
+-    *-*-darwin*)
+-        OBJC="cc"
+-        OBJCFLAGS="$CFLAGS"
+-        OBJCDEPMODE="$CCDEPMODE"
+-        AC_SUBST(OBJC)
+-        AC_SUBST(OBJCFLAGS)
+-        AC_SUBST(OBJCDEPMODE)
+-        ;;
+-esac
+ 
+ # Finally create all the generated files
+ dnl Important: Any directory that you want to be in the distcheck should
+@@ -2613,7 +2602,6 @@
+ src/video/maccommon/Makefile
+ src/video/macdsp/Makefile
+ src/video/macrom/Makefile
+-src/video/quartz/Makefile
+ src/video/svga/Makefile
+ src/video/vgl/Makefile
+ src/video/aalib/Makefile

diff --git a/SDL.spec b/SDL.spec
index 29a482248195d2723bd3ce183be12f83646ad854..6a222ec740f7eeab70fbcc0637277139d901b723 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -30,6 +30,7 @@ Patch2:               %{name}-amfix.patch
 Patch3:                %{name}-lpthread.patch
 Patch4:                %{name}-ac25x.patch
 Patch5:                %{name}-no_rpath_in_sdl-config.patch
+Patch6:                %{name}-noobjc.patch
 URL:           http://www.libsdl.org/
 BuildRequires: OpenGL-devel
 BuildRequires: XFree86-devel >= 4.0.2
@@ -153,6 +154,7 @@ SDL - przyk
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 rm -f missing