[SCM] kodi/master: Stop using embedded gnulib modules in rsxs screensaver

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 59d89444454454a399db5db04c83958c49ff7bf1
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Aug 16 23:21:12 2015 +0200

    Stop using embedded gnulib modules in rsxs screensaver
    
    Closes: #795813

diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 92aafca..4887100 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -116,3 +116,177 @@ Forwarded: not-needed
   #include "dvdnav/dvdnav_internal.h"
   #include "dvdnav/vm.h"
   #include "dvdnav/dvd_types.h"
+--- a/xbmc/screensavers/rsxs-0.9/lib/Makefile.am
++++ b/xbmc/screensavers/rsxs-0.9/lib/Makefile.am
+@@ -31,20 +31,20 @@
+ ## begin gnulib module alloca
+ 
+ 
+-libmisc_a_LIBADD += @ALLOCA@
++#libmisc_a_LIBADD += @ALLOCA@
+ ## end   gnulib module alloca
+ 
+ ## begin gnulib module alloca-opt
+ 
+-BUILT_SOURCES += $(ALLOCA_H)
+-EXTRA_DIST += alloca_.h
++#BUILT_SOURCES += $(ALLOCA_H)
++#EXTRA_DIST += alloca_.h
+ 
+ # We need the following in order to create <alloca.h> when the system
+ # doesn't have one that works with the given compiler.
+-alloca.h: alloca_.h
+-	cp $(srcdir)/alloca_.h $@-t
+-	mv $@-t $@
+-MOSTLYCLEANFILES += alloca.h alloca.h-t
++#alloca.h: alloca_.h
++#	cp $(srcdir)/alloca_.h $@-t
++#	mv $@-t $@
++#MOSTLYCLEANFILES += alloca.h alloca.h-t
+ 
+ ## end   gnulib module alloca-opt
+ 
+@@ -59,15 +59,15 @@
+ 
+ ## begin gnulib module argz
+ 
+-BUILT_SOURCES += $(ARGZ_H)
+-EXTRA_DIST += argz_.h
++#BUILT_SOURCES += $(ARGZ_H)
++#EXTRA_DIST += argz_.h
+ 
+ # We need the following in order to create <argz.h> when the system
+ # doesn't have one that works with the given compiler.
+-argz.h: argz_.h
+-	cp $(srcdir)/argz_.h $@-t
+-	mv $@-t $@
+-MOSTLYCLEANFILES += argz.h argz.h-t
++#argz.h: argz_.h
++#	cp $(srcdir)/argz_.h $@-t
++#	mv $@-t $@
++#MOSTLYCLEANFILES += argz.h argz.h-t
+ 
+ ## end   gnulib module argz
+ 
+@@ -85,15 +85,15 @@
+ 
+ ## begin gnulib module getopt
+ 
+-BUILT_SOURCES += $(GETOPT_H)
+-EXTRA_DIST += getopt_.h getopt_int.h
++#BUILT_SOURCES += $(GETOPT_H)
++#EXTRA_DIST += getopt_.h getopt_int.h
+ 
+ # We need the following in order to create <getopt.h> when the system
+ # doesn't have one that works with the given compiler.
+-getopt.h: getopt_.h
+-	cp $(srcdir)/getopt_.h $@-t
+-	mv $@-t $@
+-MOSTLYCLEANFILES += getopt.h getopt.h-t
++#getopt.h: getopt_.h
++#	cp $(srcdir)/getopt_.h $@-t
++#	mv $@-t $@
++#MOSTLYCLEANFILES += getopt.h getopt.h-t
+ 
+ ## end   gnulib module getopt
+ 
+@@ -129,15 +129,15 @@
+ 
+ ## begin gnulib module stdbool
+ 
+-BUILT_SOURCES += $(STDBOOL_H)
+-EXTRA_DIST += stdbool_.h
++#BUILT_SOURCES += $(STDBOOL_H)
++#EXTRA_DIST += stdbool_.h
+ 
+ # We need the following in order to create <stdbool.h> when the system
+ # doesn't have one that works.
+-stdbool.h: stdbool_.h
+-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
+-	mv $@-t $@
+-MOSTLYCLEANFILES += stdbool.h stdbool.h-t
++#stdbool.h: stdbool_.h
++#	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
++#	mv $@-t $@
++# MOSTLYCLEANFILES += stdbool.h stdbool.h-t
+ 
+ ## end   gnulib module stdbool
+ 
+@@ -175,13 +175,13 @@
+ 
+ ## begin gnulib module unistd
+ 
+-BUILT_SOURCES += $(UNISTD_H)
++#BUILT_SOURCES += $(UNISTD_H)
+ 
+ # We need the following in order to create an empty placeholder for
+ # <unistd.h> when the system doesn't have one.
+-unistd.h:
+-	echo '/* Empty placeholder for $@.  */' >$@
+-MOSTLYCLEANFILES += unistd.h
++#unistd.h:
++#	echo '/* Empty placeholder for $@.  */' >$@
++#MOSTLYCLEANFILES += unistd.h
+ 
+ ## end   gnulib module unistd
+ 
+--- a/xbmc/screensavers/rsxs-0.9/Makefile.am
++++ b/xbmc/screensavers/rsxs-0.9/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = lib libltdl src config
++SUBDIRS = src config
+ EXTRA_DIST = scripts THANKS
+ DISTCHECK_CONFIGURE_FLAGS = --without-xscreensaver
+ ACLOCAL_AMFLAGS = -I m4
+--- a/xbmc/screensavers/rsxs-0.9/configure.ac
++++ b/xbmc/screensavers/rsxs-0.9/configure.ac
+@@ -8,7 +8,7 @@
+ AC_SUBST(RELEASE, 1)
+ 
+ AC_CONFIG_MACRO_DIR(m4)
+-AC_CONFIG_LIBOBJ_DIR(lib)
++#AC_CONFIG_LIBOBJ_DIR(lib)
+ 
+ AC_GNU_SOURCE
+ 
+--- a/xbmc/screensavers/rsxs-0.9/src/Makefile.common
++++ b/xbmc/screensavers/rsxs-0.9/src/Makefile.common
+@@ -10,13 +10,13 @@
+ SOUND = ../sound.hh ../sound.cc ../oggsound.hh ../oggsound.cc
+ DLOPEN = ../dlopen.hh
+ 
+-LIBMISC = $(top_builddir)/lib/libmisc.a
++LIBMISC = 
+ if DLOPEN
+-LIBLTDL = $(top_builddir)/libltdl/libltdl.a
+-LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
++LIBLTDL = 
++LIBLTDL_CPPFLAGS =
+ endif DLOPEN
+ 
+-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS) -D_LINUX -DXBMC
++AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. $(X_CPPFLAGS) -D_LINUX -DXBMC
+ AM_LDFLAGS =
+ AM_CXXFLAGS =
+ 
+--- a/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc
++++ b/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc
+@@ -1,4 +1,4 @@
+ plasma.xbs: solarwinds.o wind.o
+-	g++ -shared -o SolarWinds.xbs ../common.o solarwinds.o wind.o ../../lib/libmisc.a -lXmu
++	g++ -shared -o SolarWinds.xbs ../common.o solarwinds.o wind.o -lXmu
+ #	cp SolarWinds.xbs /home/yuvalt/XBMC/screensavers/
+ 	cp SolarWinds.xbs ../../../../../XBMC/screensavers/
+--- a/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
++++ b/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
+@@ -8,7 +8,7 @@
+ 
+ DIRS=$(RSXS)
+ 
+-RSXS-OBJS=$(RSXS)/src/common.o $(RSXS)/src/color.o $(RSXS)/lib/libmisc.a
++RSXS-OBJS=$(RSXS)/src/common.o $(RSXS)/src/color.o
+ 
+ SOLARWINDS-OUT=$(OUTDIR)/screensaver.rsxs.solarwinds/Solarwinds.xbs
+ SOLARWINDS-DEP=$(RSXS)/src/solarwinds/rs-solarwinds

-- 
kodi packaging