x11-misc/fireflies: Fix XScreensaver support

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

5 files changed, 150 insertions, 11 deletions

diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index 75ac0c322dd3..ce6fc429d4dc 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/fireflies
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.31 2014/06/21 19:27:50 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.32 2015/06/06 18:49:53 sping Exp $
+
+*fireflies-2.07-r2 (06 Jun 2015)
+
+  06 Jun 2015; Sebastian Pipping <sping@gentoo.org> +fireflies-2.07-r2.ebuild,
+  +files/fireflies-2.07-glx-detection.patch,
+  +files/fireflies-2.07-linking.patch:
+  Fix broken XScreensaver integration
 
   21 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> -fireflies-2.07.ebuild:
   old
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 4dcff155de17..6537ba458ad2 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -6,20 +6,19 @@ AUX fireflies-2.06-configure.patch 358 SHA256 9431612c107be0cbd73a3604d01f42a906
 AUX fireflies-2.07-build_system.patch 1920 SHA256 096cfd6ce9c2183799930ea8bdb64e733ccb1592281cb7921b551000eb42ac46 SHA512 55eda59e16d70006f0bcf31495b34fb762ae63900ae68b562fdd9a6d95b6be23a77b564b03bcf1b32012ff78db9b8cb44dc376b9f3bb32af690f40b31bc43f0e WHIRLPOOL 97272073de14e72246c669af7efab5034b17d4fdd97f39211ff0925caf0d394819612ddeca2c4616e1984697c75f9f0dd0be0fc4386e1fcf76a4b13bd00b2a4a
 AUX fireflies-2.07-gcc43.patch 330 SHA256 8a17ccace374dbc5c1683051080ea39bac49443061977bde726731e4dcaf749c SHA512 8ee85a92b6f5af495c2484df496627d8af5c3f70e18d10ea3463d8cc6fa1f35005532fcc2eb197e6f48ffe6865223cc78ebf0fc60290441cde4425572e2fe444 WHIRLPOOL d995991c9e96d6f216bc625ad463b9f7686270288bfa477b896f009502851037b4d8d0ff68b51bdd64fe65654a9898f9cb43b1bf2b1b87204cecb10602c6e489
 AUX fireflies-2.07-gcc44.patch 390 SHA256 3d9cca98813125a881614d0c027d8251db211ea7c0c6e2fc35e53a4fbeff72b6 SHA512 aa6a1b987efe983678b6a2a2b2a5cb91699a54587ef34c3b5c5ed9208a8689e6ae6f1ef4ff6328286f631856fbb406d0c026ef39ad6518fc1378a401f881a292 WHIRLPOOL d62935c116c46e47b3fd03526954c89939884e9a03145f34903cefbc558d1b5d8be242e7767ae039ddd64c60dc7bd5fa9d75e7e59a420bbbc34ea0363392bb7b
+AUX fireflies-2.07-glx-detection.patch 1462 SHA256 347abab9b6b5e4e8411b79c3f5a956c1c9e5333e3da475fbb325c1e7925af6f2 SHA512 6db9d2eaf77fc1efd2a4705375317adb997f9841707195ce61f1bdeaea0396ec1b462f993d251804979dc53fa25aa94595ca2a5bb6c666bcc730405e6ed9cf4d WHIRLPOOL 9e15f8b13493e3b57828dd2c91ffbc977f85044eafd4fb3a5b592da9b7ebddd07b0a1d35856b85843ca06899e3c3e52e86b65a758bb78a2b36c33d123d04f2ed
 AUX fireflies-2.07-libgfx-libpng15.patch 590 SHA256 1c3f88c0a99ccb58ef35ff0f4a4239ee0d5d521eb053ff9019f30377b5ad29ed SHA512 d096c33979bbc910445e3f62ee137bc37a76ffbe42924d348789f65177d650656c52249dc62e7f596aba1283283414d9fad12ad1d71c55f29a9fc60ac32e1bf0 WHIRLPOOL c17426f0fc0c6b7b4a2f3d4ab81de0af9f5fa75533bb7c35488c6715405c57332944d8a09498f563e642c9e672a9e6b929844e13bb8d2727e90f9007bb2e81c9
 AUX fireflies-2.07-libgfx-libpng16.patch 457 SHA256 754801780d56aaf7970d74b0ff05c08a4ea9357824ca8bfca82a631c31896c32 SHA512 69ee2b4fb48ba340c4e31b7847ee9aafcb54ae5f9533af2594d99434acba7c251490511b039756ea018dbe4e242a9a9690f3f8f57c733509c21e7a9fe1fed643 WHIRLPOOL 6ed4dc9e1880f9e72ae113da2917015d45b49d5a2616f6636fbbfe7b15a75dd178dc09dbd0e6201ab61e78490b20cf7795a9049bdfe6e5c43940201602367998
+AUX fireflies-2.07-linking.patch 818 SHA256 66204616173ffd9da88ca652a7447d654f4eceec5e307a992fccde383c46bb3f SHA512 509782c283dfafaad5fe9f236614ec7d0521623530787dcbd58eaab3147af7c191e5b8f2fc92c546a56ca666a590b2fad5b310efbc1ad3e2a242e53c1478ed84 WHIRLPOOL 6bc43c197d25e2636e26f375dd86950e163746d0f61de0227a84bb4e94cefd1d8c43a547e9a4573606cb96a1b16a14aff9125bb18fc26e7c168f19d8aac5f503
 DIST fireflies-2.07.tar.gz 199917 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 SHA512 d8d478c3ff7705eb2e2f04f490d37ea8d7edcac2fcdc99e06f9bad09c0f1b678d62f09b3d965734f230b2aa3d804c81ad3d15429ede7cb8e951213716f61666a WHIRLPOOL c7714c4f1d694a9b832594ee0627324dc6a3606d62d1a5e83ba05fb1ccfdc3a1cc7e86c8c3634cd008f70e6e443e668c3c41e795941d59af3370f1c5b0562509
 EBUILD fireflies-2.07-r1.ebuild 1076 SHA256 ee0a441fd8c1c015d036bb43d0b9c59581e953a1c13c7a9b0a0abf60954c4d77 SHA512 585c7c3106f2f80ac217aae460d37d4c7397184d65df42f09a609bfa41b6a603da9c0f56789a945ed1f88bf8a0743d4b8308b44f43215dba44cfc742b34d6462 WHIRLPOOL 19945824e9b756f0ec1922a51c93771c56b079457b5b5629efa772bf8d85167c67fd7c1dd79897de522eec5c598c5ec357db7b42ad0042e602ded9bd621de87f
-MISC ChangeLog 4381 SHA256 1a72f3d0ac04375313e1ad4868eb663844d8bbc9bbfff552683235df4497ddb4 SHA512 84db165350bd9415e9a18b66ca4ef7d5a9b30e702a0dfbef2353aef276fff9b04674646a255ebb6f77bbacf0c73784a2fa62ba44ff35a2d3e7a079c1497c6de6 WHIRLPOOL c894951804e499b14346ec6778368745ecbc7ffb059a65d0492eaade4d4596713a97f795483155848b2fe6c29e79587f1e0a9c391960c51d07694250e1aae51d
+EBUILD fireflies-2.07-r2.ebuild 1267 SHA256 541770a5b984b617dca10a96b3c8aad1fee4ce789c79701ba1372ef69e0ba107 SHA512 926e3103716ae698ab9a73472dbc8dee7f8d00ffb55302b928e1a51ba89c95b6a59b89317c7d226e71c67807d21a89a0d404c18ba2426ed5a52b452d29bb1dec WHIRLPOOL 2feb60ef3e64d399e7b47f1fcaa90564832f9567ac96af47767ede51fe06b00de521c7155449c00f46a94d17c85516d15fe5d31f66b31d32891f573299981149
+MISC ChangeLog 4613 SHA256 7652254a65251145d82b8d1579abc56402bb6a0f83424f17b1b6972960f0cadc SHA512 2111f13eade4240a59c2c138c79a60dcc596fbcd4f2ca1231d6f4a94cada1294ca2ca5e6cc1326168c98433f1f98059c5388b57e9efc2bfb3ff275f010dce1df WHIRLPOOL 120b1979afb0e3f5e284fe06b7e37acc8b7ceba2b82a6282f8d7a840679e40b0ed48591ede66282750e1248fb1a3b70fe0c2bae071b3e55f2e636b45de577c00
 MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTpdvlAAoJEEdUh39IaPFNdf8IAJwwVR2Vx6EyDaV1pyiDbcRj
-VOvFha0IcOYRSvgTgXRDqstkB/yd+HhJSroTSWvt5audwd/uv64wTL3DLrfZnceC
-UbtWt4M8DHSJpDPP668z9OLD/KscL88ELINXa7iSjkDHP/Oi7kUsbf830cGqx753
-MKePU53pVR+Mc7N1C/Zu0Himd3SbbqUHee3MR6ER6t7G0DkuTH/l3G0SOcpv7y7j
-et/tQxHAqG0+/qCzd9wts3Kkv3fMHleowespsAgYjBlIJ1LP/TG3S7H/n6THJ7m5
-yB/eQB7Ge6zihgaVO3NC9Py94y9rZhoW+LGlF7kX8pf8ddqcVkLGqnuywuf5LmU=
-=pzV6
+iEYEAREIAAYFAlVzQNIACgkQsAvGakAaFgDTagCeOBmG0OnwmlasX8qxHM3J+gFO
+BHsAoNAf3pxw9VFA55ELFl0GYQ+86ivW
+=qyMm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
new file mode 100644
index 000000000000..f4c8bf5bb8f3
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
@@ -0,0 +1,52 @@
+From 41db6d93ab4d91f74761f8a34800b9026b0482c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:25:39 +0200
+Subject: [PATCH] Fix underquoting in configure.ac
+
+.. resulting in
+
+  checking for glXSwapBuffers in -lGL... ./configure: line 3095: ac_fn_c_try_link: command not found
+  no
+
+at runtime.
+---
+ configure.ac | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7bb7e72..cd7fa54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,18 +54,18 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-    AC_CHECK_LIB(GL, glXSwapBuffers,\
+-	AC_DEFINE(HAVE_GLX)
+-	OPT_OBJS="$OPT_OBJS canvas_glx.o",\
+-	AC_CHECK_LIB(MesaGL, glXSwapBuffers,\
+-	    AC_DEFINE(HAVE_GLX)
+-	    OPT_OBJS="$OPT_OBJS canvas_glx.o"))
+-
+-    AC_CHECK_LIB(GL, glBegin, \
+-	GL_LIBS="-lGL -lGLU", \
+-	AC_CHECK_LIB(MesaGL, glBegin, \
++    AC_CHECK_LIB([GL], [glXSwapBuffers],\
++	[AC_DEFINE(HAVE_GLX)
++	OPT_OBJS="$OPT_OBJS canvas_glx.o"],\
++	[AC_CHECK_LIB([MesaGL], [glXSwapBuffers],\
++	    [AC_DEFINE(HAVE_GLX)
++	    OPT_OBJS="$OPT_OBJS canvas_glx.o"])])
++
++    AC_CHECK_LIB([GL], [glBegin], \
++	[GL_LIBS="-lGL -lGLU"], \
++	[AC_CHECK_LIB([MesaGL], [glBegin], \
+ 	    [GL_LIBS="-lMesaGL -lMesaGLU"], \
+-	    AC_MSG_ERROR([cannot find GL libraries])))
++	    [AC_MSG_ERROR([cannot find GL libraries])])])
+ 
+     ;;
+ esac
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/files/fireflies-2.07-linking.patch b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
new file mode 100644
index 000000000000..cc7e16994878
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
@@ -0,0 +1,28 @@
+From da7c37ae638ac9e2989a3d65f529997c6d2111e1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:38:27 +0200
+Subject: [PATCH] Fix linking of src/canvas_glx.o
+
+Otherwise:
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../x86_64-pc-linux-gnu/bin/ld: canvas_glx.o: undefined reference to symbol 'XPending'
+/usr/lib64/libX11.so.6: error adding symbols: DSO missing from command line
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cd7fa54..1fa000b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,7 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+ 	    test -f $try && RCFILE=$try
+     done
+ 
+-    OPT_LIBS=""
++    OPT_LIBS="-lX11"
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/fireflies-2.07-r2.ebuild b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
new file mode 100644
index 000000000000..44140ff3946a
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r2.ebuild,v 1.1 2015/06/06 18:49:53 sping Exp $
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
+SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2 HPND" # HPND is for libgfx, see src_unpack()
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog debian/README.Debian README TODO )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar -xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-glx-detection.patch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_install() {
+	exeinto /usr/lib  # FHS: internal binaries
+	newexe {,${PN}-}add-xscreensaver
+
+	default
+}