r8344 - in packages/branches/openarena/openarena-0.8.1/debian: . patches

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Fri Nov 7 16:34:23 UTC 2008 

Author: fuddl-guest
Date: 2008-11-07 16:34:23 +0000 (Fri, 07 Nov 2008)
New Revision: 8344

Added:
   packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
Modified:
   packages/branches/openarena/openarena-0.8.1/debian/changelog
   packages/branches/openarena/openarena-0.8.1/debian/control
   packages/branches/openarena/openarena-0.8.1/debian/patches/00list
   packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch
Log:
+ patch upstream sources to avoid building shipped jpeg library, but link against package libjpeg62 instead

Modified: packages/branches/openarena/openarena-0.8.1/debian/changelog
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/changelog	2008-11-06 18:22:23 UTC (rev 8343)
+++ packages/branches/openarena/openarena-0.8.1/debian/changelog	2008-11-07 16:34:23 UTC (rev 8344)
@@ -8,8 +8,10 @@
     openarena-server 
   * Refresh/edit 10_remove_upstream_build_flags.dpatch: We want to keep
     distribution-specific build flags in our rules file
+  * Add 20_dont_build_shipped_jpeg.dpatch to build against system jpeg library
+    (Closes: #495966) 
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Thu, 06 Nov 2008 16:57:07 +0100
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 07 Nov 2008 17:31:16 +0100
 
 openarena (0.7.7+dfsg1-1) unstable; urgency=low
 

Modified: packages/branches/openarena/openarena-0.8.1/debian/control
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/control	2008-11-06 18:22:23 UTC (rev 8343)
+++ packages/branches/openarena/openarena-0.8.1/debian/control	2008-11-07 16:34:23 UTC (rev 8344)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev
+Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev, libjpeg62-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openarena/?op=log

Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/00list
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/00list	2008-11-06 18:22:23 UTC (rev 8343)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/00list	2008-11-07 16:34:23 UTC (rev 8344)
@@ -1,2 +1,3 @@
 10_fix_build_and_binary_on_alpha.dpatch
 10_remove_upstream_build_flags.dpatch
+20_dont_build_shipped_jpeg.dpatch

Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch	2008-11-06 18:22:23 UTC (rev 8343)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch	2008-11-07 16:34:23 UTC (rev 8344)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad openarena-0.8.1~/Makefile.local openarena-0.8.1/Makefile.local
---- openarena-0.8.1~/Makefile.local	2008-08-09 22:22:37.000000000 +0200
-+++ openarena-0.8.1/Makefile.local	2008-11-06 16:56:33.000000000 +0100
+--- openarena-0.8.1~/Makefile.local	2008-11-07 17:29:20.000000000 +0100
++++ openarena-0.8.1/Makefile.local	2008-11-07 17:29:27.000000000 +0100
 @@ -3,10 +3,10 @@
  COPYDIR="/usr/local/games/openarena"
  

Added: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch	                        (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch	2008-11-07 16:34:23 UTC (rev 8344)
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_dont_build_shipped_jpeg.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openarena-0.8.1~/Makefile openarena-0.8.1/Makefile
+--- openarena-0.8.1~/Makefile	2008-11-07 16:50:41.000000000 +0100
++++ openarena-0.8.1/Makefile	2008-11-07 16:59:42.000000000 +0100
+@@ -158,7 +158,7 @@
+ NDIR=$(MOUNT_DIR)/null
+ UIDIR=$(MOUNT_DIR)/ui
+ Q3UIDIR=$(MOUNT_DIR)/q3_ui
+-JPDIR=$(MOUNT_DIR)/jpeg-6
++#JPDIR=$(MOUNT_DIR)/jpeg-6
+ SPEEXDIR=$(MOUNT_DIR)/libspeex
+ Q3ASMDIR=$(MOUNT_DIR)/tools/asm
+ LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
+@@ -233,6 +233,7 @@
+ 
+   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+     -pipe -DUSE_ICON $(shell sdl-config --cflags)
++  CLIENT_LDFLAGS += -ljpeg
+ 
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL
+@@ -1283,42 +1284,6 @@
+   $(B)/client/l_script.o \
+   $(B)/client/l_struct.o \
+   \
+-  $(B)/client/jcapimin.o \
+-  $(B)/client/jcapistd.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
+-  $(B)/client/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+-  $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+-  \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+   $(B)/client/tr_bloom.o \
+@@ -1894,8 +1859,8 @@
+ $(B)/client/%.o: $(BLIBDIR)/%.c
+ 	$(DO_BOT_CC)
+ 
+-$(B)/client/%.o: $(JPDIR)/%.c
+-	$(DO_CC)
++#$(B)/client/%.o: $(JPDIR)/%.c
++#	$(DO_CC)
+ 
+ $(B)/client/%.o: $(SPEEXDIR)/%.c
+ 	$(DO_CC)


Property changes on: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-games-commits mailing list