diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-06-06 18:50:01 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-06-06 18:50:01 +0000 |
| commit | 8d1cc382a079ed8e7f6f3d033df4b7a0ea3064bd (patch) | |
| tree | b7195ab2a710fbd7c9ff282a8fc6d0a0fe10d8be /x11-misc/fireflies/files | |
| parent | Add github to remote-id in metadata.xml (diff) | |
| download | historical-8d1cc382a079ed8e7f6f3d033df4b7a0ea3064bd.tar.gz historical-8d1cc382a079ed8e7f6f3d033df4b7a0ea3064bd.tar.bz2 historical-8d1cc382a079ed8e7f6f3d033df4b7a0ea3064bd.zip | |
x11-misc/fireflies: Fix XScreensaver support
Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600
Diffstat (limited to 'x11-misc/fireflies/files')
| -rw-r--r-- | x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch | 52 | ||||
| -rw-r--r-- | x11-misc/fireflies/files/fireflies-2.07-linking.patch | 28 |
2 files changed, 80 insertions, 0 deletions
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 + |