[vlc-commits] commit: Contribs: improvements on the resiliance of sidplay building ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan 15 16:59:53 2011 +0100| [c7866a772c3fada3a78b5f052e5553232ba336be] | committer: Jean-Baptiste Kempf 

Contribs: improvements on the resiliance of sidplay building

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7866a772c3fada3a78b5f052e5553232ba336be
---

 extras/contrib/src/Patches/sidplay2-noutils.patch |   11 +++++++++
 extras/contrib/src/Patches/sidplay2-string.patch  |   24 +++++++++++++++++++++
 extras/contrib/src/contrib-src.mak                |    5 +++-
 3 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Patches/sidplay2-noutils.patch b/extras/contrib/src/Patches/sidplay2-noutils.patch
new file mode 100644
index 0000000..0917b50
--- /dev/null
+++ b/extras/contrib/src/Patches/sidplay2-noutils.patch
@@ -0,0 +1,11 @@
+--- sidplay-2.1.1/Makefile.am	2002-12-23 21:21:03.000000000 +0100
++++ sidplay-2.1.1.new/Makefile.am	2011-01-15 16:50:45.517649286 +0100
+@@ -1,7 +1,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = libsidplay libsidutils resid builders
++SUBDIRS = libsidplay resid builders
+ 
+ # Remove CVS directories from any subdirs that get
+ # included completely (e.g. win, directx,...).
diff --git a/extras/contrib/src/Patches/sidplay2-string.patch b/extras/contrib/src/Patches/sidplay2-string.patch
new file mode 100644
index 0000000..62e835b
--- /dev/null
+++ b/extras/contrib/src/Patches/sidplay2-string.patch
@@ -0,0 +1,24 @@
+diff -ruN sidplay-2.1.1/builders/resid-builder/src/resid-builder.cpp sidplay-2.1.1.new/builders/resid-builder/src/resid-builder.cpp
+--- sidplay-2.1.1/builders/resid-builder/src/resid-builder.cpp	2004-06-14 22:07:58.000000000 +0200
++++ sidplay-2.1.1.new/builders/resid-builder/src/resid-builder.cpp	2011-01-15 16:49:24.909660710 +0100
+@@ -46,6 +46,8 @@
+ #include "resid.h"
+ #include "resid-emu.h"
+ 
++#include <string.h>
++
+ // Error String(s)
+ const char *ReSIDBuilder::ERR_FILTER_DEFINITION = "RESID ERROR: Filter definition is not valid (see docs).";
+ 
+Les fichiers binaires sidplay-2.1.1/builders/resid-builder/src/resid-builder.o et sidplay-2.1.1.new/builders/resid-builder/src/resid-builder.o sont différents.
+diff -ruN sidplay-2.1.1/builders/resid-builder/src/resid.cpp sidplay-2.1.1.new/builders/resid-builder/src/resid.cpp
+--- sidplay-2.1.1/builders/resid-builder/src/resid.cpp	2004-06-14 22:07:58.000000000 +0200
++++ sidplay-2.1.1.new/builders/resid-builder/src/resid.cpp	2011-01-15 16:49:05.441652832 +0100
+@@ -25,6 +25,7 @@
+ #include "resid.h"
+ #include "resid-emu.h"
+ 
++#include <string.h>
+ 
+ char ReSID::m_credit[];
+ 
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 02a523c..4e03731 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2658,9 +2658,12 @@ sidplay-2.1.1: sidplay-libs-2.1.1.tar.gz
 	(cd $@; patch -p1 < ../Patches/sidplay2-openmode.patch)
 	(cd $@; patch -p1 < ../Patches/sidplay2-endian.patch)
 	(cd $@; patch -p1 < ../Patches/sidplay2-smartprt.patch)
+	(cd $@; patch -p1 < ../Patches/sidplay2-noutils.patch)
+	(cd $@; patch -p1 < ../Patches/sidplay2-string.patch)
+	(cd $@; autoreconf -ivf)
 
 .sidplay: sidplay-2.1.1
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make -C libsidplay && make -C libsidplay install )
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 
 CLEAN_FILE += .sidplay
 CLEAN_PKG  += sidplay-2.1.1