Revision bump, use system jpeg library instead of bundled one wrt bug #430518

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 230 insertions, 16 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index 966df974e671..ef240616f789 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quake3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.60 2012/07/13 03:45:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.61 2012/09/07 07:33:02 pinkbyte Exp $
+
+*quake3-1.36-r1 (07 Sep 2012)
+
+  07 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +quake3-1.36-r1.ebuild,
+  +files/quake3-1.36-remove-bundled-jpeg.patch:
+  Use system jpeg library wrt bug #430518
 
   13 Jul 2012; Jeff Horelick <jdhore@gentoo.org> quake3-1.36.ebuild:
   marked x86 per bug 406039
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
index 2a60e13af292..28f1085138ce 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX quake3-1.34_rc3-gcc42.patch 766 SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919 SHA512 ac853a059f14040ba76759fc221912a8ff7c37e22c77f3e4a116c0d6c2bebbfa820c9ba7c14099b77f82bec40350fb9b2f5add06dfb61570bf9509faf79297d5 WHIRLPOOL 37916393eae54671fb3d9f5764010e8f8291f0eb26b60770cc33b2ba62973b05ecf7feb6f20e397b2882b24496f6fa251e738b7f69c2e2b080bbdb87cd682f15
 AUX quake3-1.36-bots.patch 499 SHA256 b3510423a8486df90853bc1321dcec9dfdcdb1b2b3870495bca49bd8c5635e66 SHA512 75d0659a07902cd78153792353796e77ce1baf7545da370d88f37accca090bee9b94d7447bfa0d284fb98769c94ee434cf7baa6fe9f457018d00dd6431eecba0 WHIRLPOOL 0f4424c90d424354a364a6979057c72c99595285007c166dd4bdce687e2eb653255caab4b60f0178c576fbd0d022342c67cae28c1ba8a15b8b579f2276b05dd6
+AUX quake3-1.36-remove-bundled-jpeg.patch 1809 SHA256 c2976956a1ad0433af444c6b877766a0c7b4a135f400dcb445152f3f915bd9db SHA512 c36f1717c7dcf0e410ba043c1d47cde098595bfb2173da8bc846ddfddbd6ef19df32b0a1e3fe697afffcd00e873d127224c98276baa4c929d7f090552b85d1c6 WHIRLPOOL b9b33bd92d55cc1b162a1b454d5493b18acfbc05a39b4bcfec69930d7f80aa5b2e149929bd0aeb66ba1b9a4f2086295f60e707cc03bf9f63abe2669186cf8bb6
 DIST ioquake3-1.36.tar.bz2 3503058 SHA256 79b10b92e9e586748a67089ac871646fe8144004d3ab4a55158348bc38d74821 SHA512 fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645 WHIRLPOOL 5468b57504af5c33c7e8150aaaa27082654fe751f24679f81efe8441b1aab1b63e2013adc758d45799ea9a8e12eb9c39c27506a309f36762fbd07f0c3c4a5b26
 DIST ioquake3_1.34-rc3.tar.bz2 3147694 SHA256 fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01 SHA512 f45a344de82c2e40d1554c5cb35f6c00150cb8ed3cc22375cec9623bdeff44780bd4cf61ad8feead159631ec68b5a6c3a013eb8830b06f4cebcef27ac32ba0f3 WHIRLPOOL e3ce88ba3487761639359464b830efc636c340c2d1553b1eba7fd5ed45b1dda615ba52c9c53c2264b356eb083c315e6b1ca1399b1050b7b4d26fb2e763ac01ef
 EBUILD quake3-1.34_rc3.ebuild 3039 SHA256 c44f2d7119b022bb24151597f28733a6204fded6e6d52afbca435a6392a2cfc7 SHA512 161711e387829458f779b5c41c9502d9ec7cafcae7b16914ac5c48b3909c2314b63c0314e911c1f49fa6d26f82db049fc79308042bfcdcaad45612f41b710fa1 WHIRLPOOL 35fc937a928cfa41bde2657faff6c9d6b3b898e3e1a3272a426147f1b25a3448585ad7419625f1374c447b15a4c5ad1c1ce5991b744544eca3d9a1ea24173a3e
+EBUILD quake3-1.36-r1.ebuild 3997 SHA256 d1d22510aa7f0d54f09190999fc9589e323e77bf7308d41a588df6747907844a SHA512 e5b524a7ecf5b43597dcea4c92fb381891acf17a865e5f7f19528352a0d475a6c5fcd73a6cd6e244223b0b48985744395312f29f33fa5b2912c699fed5358baa WHIRLPOOL b783f07e4e40e67ea0cde9aedd2317b417764ed444885b82344010a97ab13fcdb8bb7e0e178e6ee48f53432cd0f1fc9ee14c15a8916e1bc39aa22b81bb9f261a
 EBUILD quake3-1.36.ebuild 3895 SHA256 9dfa8dcc0c861542c785d6b7684ffc353c47de6d41bd55f6988fab09f091d744 SHA512 6eebe9ea3e34ec981d0b27d8d3e17e2b2809f5166ccba9aeb57cfb7685f6543a89d0a1dbc3727d1e6cf2fbc03a8257754487117d835691c08e824fa07b0e6153 WHIRLPOOL 4ed3ad5b5d54b5d6efbcd3d754eab62ca9dfcb612f6999ac9a65b511c6f2ffde2e83683210d8f364d1ba80315d7333635c918f27cca5ce33bf328da5a7d5a122
 EBUILD quake3-9999.ebuild 3735 SHA256 b6f19043e2043e4407c882ec6932f4fe1940026372d5dd166bf534a3d3bf4ac8 SHA512 2472e656f9d5b251f3d73c9d487030b7a44d302fe4a38b343341565b7cf315cecbcbcdfed92b6b632539d816b3ccd5795c36792719be92b748e431e7301fa462 WHIRLPOOL c309260d20cefbca9630fdcbe4f9e2753dbaee49bf37baa63b68909525d7f9e8ea3d06f2149b383b0bf408c98040560654a981e0bb1d2e14adc56fe272b4f3bf
-MISC ChangeLog 6081 SHA256 4857ad937c0586716c84cd1c621b41e53ed409f4f3d0b625cc4513a0579d7187 SHA512 9e99d77d44c0f9e15d8ed3e11d07e89ae12f0505a79095e9939b9ebb6dfccdfeb34427f63c4f25296a25cc9fd584147c05246ee9bf29e12472654ed0fafd892b WHIRLPOOL b07b756178dbb5af4e8e6557cfeb196e50c3d41c976f04b27a3c750073c101cbaa1de45bf72f4ad6c391cba5857b944efc14699993463a8e314412f5631bb0f3
+MISC ChangeLog 6279 SHA256 2658870800ee8b4fbb2b4b2c2da95a5071e35fef946d0d839435523bdcff9741 SHA512 f818f05270034b240136958580fe7f32a08785ed3747fd02edf602bca79f4f5fcd9d3bf00b40d9366063e4c5098d62cddc548b71e91fe41d132336e354dd64f2 WHIRLPOOL 41a09339134febf1560d064300c5548e4b2443031d831a8f461fcbd9c29fda17b882a0d082efcf581bfe67fe3d35ec5ec38e498134e78602538d6fc5cd32cf50
 MISC metadata.xml 1187 SHA256 ded4783173bf567334634819e91ee0462c904872f723eb42674d7de9b5d514ca SHA512 de0d4036500887e723d9dbe171bc94e5a1930a2f3ff5d942a108d07249ff87eff25343430de4e1975cf948b78752096b49cf71376b64172047e1478f560cd804 WHIRLPOOL e40ec3d14524454f73e99ca89a199bbef1f5562a03560f6a7bc255a6c7fb11a31adb3108940ac32ab14e7704f20b4e53b224de3a30e545c33f8423dce3bcc0f6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJP/5nxAAoJEPUd7O0j6ekAbIQH/0fzLe8RestWpe9d0XG8aLqW
-LDytQJEXsQYAy5A7UnXV82tsNFqx5wyEwvJPYj+gtyEZkXVeiSCJRvbze5/QK/R3
-9v6vZf2+q1FG4s2GFv4drQa+UtWW5lVTaqJEQutrhK37wmW3AirlMasrN2i9PJoS
-KT9DQouRB38iDznE5/KImZdIk/9mm7fLyHlA6InFXDnVXU83xZGiw4NtGIOyWroQ
-w4LaTTpu3dwpF2EwghM0px3e4KtLhbzCikrhxbQpJ4A1Wuj5/Qgz/yD3Cl40/IhY
-xV2perebGigEiaqS8Cu7ckduXYkTQObkmpBh23W//Q3tSYP1zdqBZx5ItgA20DM=
-=o4EQ
------END PGP SIGNATURE-----
diff --git a/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch b/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch
new file mode 100644
index 000000000000..485dd71d2043
--- /dev/null
+++ b/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch
@@ -0,0 +1,72 @@
+--- Makefile.orig	2012-08-21 12:19:01.344696519 +0400
++++ Makefile	2012-08-21 12:19:23.506696348 +0400
+@@ -164,7 +164,6 @@
+ NDIR=$(MOUNT_DIR)/null
+ UIDIR=$(MOUNT_DIR)/ui
+ Q3UIDIR=$(MOUNT_DIR)/q3_ui
+-JPDIR=$(MOUNT_DIR)/jpeg-6b
+ SPEEXDIR=$(MOUNT_DIR)/libspeex
+ Q3ASMDIR=$(MOUNT_DIR)/tools/asm
+ LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
+@@ -297,7 +296,7 @@
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LIBS=-lpthread
+-  LIBS=-ldl -lm
++  LIBS=-ldl -lm -ljpeg
+ 
+   CLIENT_LIBS=$(shell sdl-config --libs) -lGL
+ 
+@@ -1297,42 +1296,6 @@
+   $(B)/client/l_script.o \
+   $(B)/client/l_struct.o \
+   \
+-  $(B)/client/jcapimin.o \
+-  $(B)/client/jcapistd.o \
+-  $(B)/client/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcphuff.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/jfdctflt.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_bsp.o \
+@@ -1921,9 +1884,6 @@
+ $(B)/client/%.o: $(BLIBDIR)/%.c
+ 	$(DO_BOT_CC)
+ 
+-$(B)/client/%.o: $(JPDIR)/%.c
+-	$(DO_CC)
+-
+ $(B)/client/%.o: $(SPEEXDIR)/%.c
+ 	$(DO_CC)
+ 
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
new file mode 100644
index 000000000000..ed9b53623555
--- /dev/null
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.36-r1.ebuild,v 1.1 2012/09/07 07:33:02 pinkbyte Exp $
+
+# quake3-9999          -> latest svn
+# quake3-9999.REV      -> use svn REV
+# quake3-VER_alphaREV  -> svn snapshot REV for version VER
+# quake3-VER           -> normal quake release
+
+EAPI=2
+inherit eutils flag-o-matic games toolchain-funcs
+[[ "${PV}" == 9999* ]] && inherit subversion
+
+MY_PN="ioquake3"
+MY_PV="${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
+HOMEPAGE="http://ioquake3.org/"
+[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
+ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+# "smp" is omitted, because currently it does not work.
+IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
+
+UIDEPEND="virtual/jpeg
+	virtual/opengl
+	media-libs/libsdl[audio,video,joystick,X,opengl]
+	openal? ( media-libs/openal )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voice? ( media-libs/speex )
+	curl? ( net-misc/curl )"
+DEPEND="opengl? ( ${UIDEPEND} )
+	!dedicated? ( ${UIDEPEND} )"
+UIRDEPEND="voice? ( mumble? ( media-sound/mumble ) )"
+RDEPEND="${DEPEND}
+	opengl? ( ${UIRDEPEND} )
+	!dedicated? ( ${UIRDEPEND} )
+	games-fps/quake3-data
+	teamarena? ( games-fps/quake3-teamarena )"
+
+if [[ "${PV}" == 9999* ]] ; then
+	S="${WORKDIR}/trunk"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+my_arch() {
+	case "${ARCH}" in
+		x86)    echo "i386" ;;
+		amd64)  echo "x86_64" ;;
+		*)      tc-arch-kernel ;;
+	esac
+}
+
+my_platform() {
+	case "${ARCH}" in
+		alpha|amd64|ppc|x86)  echo "linux" ;;
+		x86-fbsd)             echo "freebsd" ;;
+	esac
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999* ]] ; then
+		# Workaround for the version string
+		ln -s "${ESVN_WC_PATH}/.svn" .svn || die "ln ${ESVN_WC_PATH}/.svn"
+	else
+		epatch "${FILESDIR}"/${P}-bots.patch
+	fi
+
+	einfo "Fixing libspeex linking..."
+	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed"
+
+	# Use system jpeg library
+	epatch "${FILESDIR}"/${P}-remove-bundled-jpeg.patch
+}
+
+src_compile() {
+
+	buildit() { use $1 && echo 1 || echo 0 ; }
+
+	# This is the easiest way to pass CPPFLAGS to the build system, which
+	# are otherwise ignored.
+	append-flags ${CPPFLAGS}
+
+	# OPTIMIZE is disabled in favor of CFLAGS.
+	#
+	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
+	emake \
+		ARCH="$(my_arch)" \
+		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
+		BUILD_GAME_QVM=0 \
+		BUILD_GAME_SO=0 \
+		BUILD_SERVER=$(buildit dedicated) \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
+		GENERATE_DEPENDENCIES=0 \
+		OPTIMIZE="" \
+		PLATFORM="$(my_platform)" \
+		USE_CODEC_VORBIS=$(buildit vorbis) \
+		USE_CURL=$(buildit curl) \
+		USE_CURL_DLOPEN=0 \
+		USE_INTERNAL_SPEEX=0 \
+		USE_INTERNAL_ZLIB=0 \
+		USE_LOCAL_HEADERS=0 \
+		USE_MUMBLE=$(buildit mumble) \
+		USE_OPENAL=$(buildit openal) \
+		USE_OPENAL_DLOPEN=0 \
+		USE_VOIP=$(buildit voice) \
+		|| die "emake failed"
+}
+
+src_install() {
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die
+	if use voice ; then
+		dodoc voip-readme.txt || die
+	fi
+
+	if use opengl || ! use dedicated ; then
+		doicon misc/quake3.svg || die
+		make_desktop_entry quake3 "Quake III Arena"
+		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
+	fi
+
+	cd build/release-$(my_platform)-$(my_arch) || die
+	local exe target
+	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
+		if [[ -x ${exe} ]] ; then
+			target=${exe%.*}
+			newgamesbin ${exe} ${target} || die "newgamesbin ${target}"
+			dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}"
+		fi
+	done
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	ewarn "The source version of Quake III Arena will not work with PunkBuster."
+	ewarn "If you need PB support, then use the games-fps/quake3-bin package."
+}