Fixup more of the build system and fix png error #149540 by Carl Fongheiser.

(Portage version: 2.1.2_pre2)

6 files changed, 85 insertions, 9 deletions

diff --git a/media-video/SDLcam/ChangeLog b/media-video/SDLcam/ChangeLog
index 0c67c2b0291c..97a4a092833b 100644
--- a/media-video/SDLcam/ChangeLog
+++ b/media-video/SDLcam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/SDLcam
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.6 2005/10/14 00:36:14 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.7 2006/09/30 19:04:08 vapier Exp $
+
+  30 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/SDLcam-0.7.3-build.patch, -files/0.7.3-no-divx.patch,
+  files/SDLcam-0.7.3-prototypes.patch, SDLcam-0.7.3-r2.ebuild:
+  Fixup more of the build system and fix png error #149540 by Carl Fongheiser.
 
 *SDLcam-0.7.3-r2 (14 Oct 2005)
 
diff --git a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
index 744412b9c4e8..c7fd25592534 100644
--- a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
+++ b/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild,v 1.1 2005/10/14 00:36:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild,v 1.2 2006/09/30 19:04:08 vapier Exp $
 
 inherit eutils
 
@@ -23,15 +23,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-gcc3.patch
-	epatch "${FILESDIR}"/${PV}-no-divx.patch
 	rm capture/divx.c   # the divx.so needs to be ported to newer avifile
 	epatch "${FILESDIR}"/${PV}-linux-2.6.patch
 	epatch "${FILESDIR}"/${P}-tsc.patch #109161
 	epatch "${FILESDIR}"/${P}-prototypes.patch
-	sed -i \
-		-e "s: -g: ${CFLAGS} `avifile-config --cflags`:" \
-		-e 's:-Wstrict-prototypes::' \
-		Makefile
+	epatch "${FILESDIR}"/${P}-build.patch
 	sed -i "/#include/s:avifile/::" capture/divx2.cpp
 
 	# Don't you love hardcoded vars?
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-build.patch b/media-video/SDLcam/files/SDLcam-0.7.3-build.patch
new file mode 100644
index 000000000000..ecbead404887
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-build.patch
@@ -0,0 +1,60 @@
+--- Makefile
++++ Makefile
+@@ -1,13 +1,14 @@
+ CC = gcc
+-CPP = g++
+-LD = $(CPP)
+-LDFLAGS = `sdl-config --libs` `xml2-config --libs` -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl
++CXX = g++
++LD = $(CC)
++LDFLAGS += $(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_image -lSDL_ttf -lm -lxml2 -ljpeg -ldl -lpng
+ PROG = SDLcam
+ 
+-FEATURES = -DMMX -DTIMER
++CPPFLAGS = -DMMX -DTIMER -DPROG_VERSION=\"0.7.3\"
+ 
+-MMXFLAGS =     -Wshadow -Wall -Wstrict-prototypes `sdl-config --cflags` `xml2-config --cflags` -DPROG_VERSION=\"0.7.3\" $(FEATURES)
+-CFLAGS = $(MMXFLAGS) -g
++MMXFLAGS =     -Wshadow -Wall $(shell sdl-config --cflags) $(shell xml2-config --cflags)
++CFLAGS += $(MMXFLAGS) $(CPPFLAGS) -Wstrict-prototypes
++CXXFLAGS += $(MMXFLAGS) $(CPPFLAGS)
+ 
+ 
+ OBJS = main.o init.o SDL_v4l.o SDL_v4l_filters.o webcam.o interface.o configuration.o config_file.o SDL_v4l_filters_thomas.o dump_thomas.o capture.o ftp-upload.o logo.o parser.o misc.o xml_theme.o dyn_misc.o
+@@ -31,28 +32,28 @@
+ 	./install
+ 
+ %.o: %.cpp
+-	$(CC) $(CFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) -c $<
+ 
+ %.o: %.c
+-	$(CPP) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) -c $<
+ 
+ sources/%.so: sources/%.cpp
+-	$(CPP) $(FEATURES) -g -fPIC -shared -o $@ $?
++	$(CXX) $(CXXFLAGS) -fPIC -shared -o $@ $? $(LDFLAGS)
+ 
+ sources/jpeg.so: sources/jpeg.cpp
+-	$(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? -ljpeg
++	$(CXX) $(CXXFLAGS) -fPIC -shared -o $@ $? -ljpeg $(LDFLAGS)
+ 
+ filter/%.so: filter/%.c
+-	$(CC) $(FEATURES) -g -fPIC -shared -o $@ $?
++	$(CC) $(CFLAGS) -fPIC -shared -o $@ $? $(LDFLAGS)
+ 
+ capture/mpeg.so: capture/mpeg.c
+-	- $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -lfame
++	$(CC) $(CFLAGS) -fPIC -shared -o $@ $? -lfame $(LDFLAGS)
+ 
+ capture/divx.so: capture/divx.c
+-	- $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -ldivxencore
++	$(CC) $(CFLAGS) -fPIC -shared -o $@ $? -ldivxencore $(LDFLAGS)
+ 
+ capture/divx2.so: capture/divx2.cpp
+-	- $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $?
++	$(CXX) $(CXXFLAGS) -fPIC -shared -o $@ $? $(LDFLAGS)
+ 
+ SDLcam: $(OBJS)
+ 	$(LD) $(LDFLAGS) $(OBJS) -o $(PROG) 
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch b/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
index c63678985c58..05056f1e96ca 100644
--- a/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
@@ -19,3 +19,14 @@
  void SDL_v4l_Reorder_cleanup (void);
  int SDL_v4l_Reorder     (const SDL_v4l_image *SRC, SDL_v4l_image *DST,int off_x,int off_y,int typ,int radius,double effekt);
  #ifdef __cplusplus
+--- SDL_v4l_filters.c
++++ SDL_v4l_filters.c
+@@ -340,7 +340,7 @@
+   SDL_v4l_Reorder_cleanup			();
+ }}}
+ 
+-void LineRGB (SDL_v4l_image *image, unsigned int X1, unsigned int Y1, unsigned int x2, unsigned int y2, unsigned char r, unsigned char g, unsigned char b ) {{{
++void LineRGB (SDL_v4l_image *image, int X1, int Y1, int x2, int y2, unsigned char r, unsigned char g, unsigned char b ) {{{
+ 	int diry = image->w;
+ 	int xinc = 1;
+ 	int yinc = 1;
diff --git a/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1 b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1
index a9c2256dddd8..4bd96c67556f 100644
--- a/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1
+++ b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1
@@ -1 +1,3 @@
 MD5 82b7d7e7e6f4d6fe1cd2c4ab97232fd8 SDLcam-0.7.3.tar.gz 299421
+RMD160 bb59dadae8a2ac4f5f86b16abb298a498e25a5eb SDLcam-0.7.3.tar.gz 299421
+SHA256 227e44ab23fd3081e170a61fac81f8920cf8f4c34d92ea57ce61fd056674c6a4 SDLcam-0.7.3.tar.gz 299421
diff --git a/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2 b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2
index a9c2256dddd8..4bd96c67556f 100644
--- a/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2
+++ b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2
@@ -1 +1,3 @@
 MD5 82b7d7e7e6f4d6fe1cd2c4ab97232fd8 SDLcam-0.7.3.tar.gz 299421
+RMD160 bb59dadae8a2ac4f5f86b16abb298a498e25a5eb SDLcam-0.7.3.tar.gz 299421
+SHA256 227e44ab23fd3081e170a61fac81f8920cf8f4c34d92ea57ce61fd056674c6a4 SDLcam-0.7.3.tar.gz 299421