52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
Index: rss-glx_0.9.1/configure.in
|
|
===================================================================
|
|
--- rss-glx_0.9.1.orig/configure.in 2017-03-27 13:34:31.042941813 +0200
|
|
+++ rss-glx_0.9.1/configure.in 2017-03-27 13:34:31.050941977 +0200
|
|
@@ -75,7 +75,7 @@ fi
|
|
AC_CHECK_FUNCS(random_r nrand48)
|
|
|
|
# Check for ImageMagick.
|
|
-PKG_CHECK_MODULES(Wand, Wand >= 6.4)
|
|
+PKG_CHECK_MODULES(MagickWand, MagickWand >= 6.4)
|
|
|
|
if test -d src/skyrocket_sounds ; then
|
|
AC_ARG_ENABLE(sound, [ --disable-sound Don't compile with sound.])
|
|
Index: rss-glx_0.9.1/src/Makefile.am
|
|
===================================================================
|
|
--- rss-glx_0.9.1.orig/src/Makefile.am 2010-01-04 01:44:04.000000000 +0100
|
|
+++ rss-glx_0.9.1/src/Makefile.am 2017-03-27 13:36:06.468859903 +0200
|
|
@@ -12,8 +12,8 @@ colorfire_LDADD = @BZIP2@
|
|
cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h
|
|
cyclone_LDADD = -LrsMath -lrsMath
|
|
drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c
|
|
-drempels_CXXFLAGS = @Wand_CFLAGS@
|
|
-drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@
|
|
+drempels_CXXFLAGS = @MagickWand_CFLAGS@
|
|
+drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@
|
|
euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp
|
|
euphoria_LDADD = -LrsMath -lrsMath @BZIP2@
|
|
feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp
|
|
Index: rss-glx_0.9.1/src/TexMgr.cpp
|
|
===================================================================
|
|
--- rss-glx_0.9.1.orig/src/TexMgr.cpp 2009-05-19 20:10:43.000000000 +0200
|
|
+++ rss-glx_0.9.1/src/TexMgr.cpp 2017-03-27 13:34:31.050941977 +0200
|
|
@@ -25,8 +25,8 @@
|
|
#endif
|
|
#include <cstdlib>
|
|
|
|
-#include <magick/api.h>
|
|
-#include <wand/magick-wand.h>
|
|
+#include <magick/MagickCore.h>
|
|
+#include <wand/MagickWand.h>
|
|
#include <dirent.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
@@ -258,7 +258,7 @@ void TexMgr::loadNextImageFromDisk() {
|
|
ExceptionInfo exception;
|
|
int dirLoop = 0;
|
|
|
|
- GetExceptionInfo (&exception);
|
|
+ ClearMagickException (&exception);
|
|
|
|
int imageLoaded = 0;
|
|
do {
|