Make the build not suck at life and spread some ppc/ppc64 love.

Package-Manager: portage-2.1.3_rc8

4 files changed, 171 insertions, 22 deletions

diff --git a/media-video/spcaview/ChangeLog b/media-video/spcaview/ChangeLog
index 6637245da8fc..bf8667b2fe18 100644
--- a/media-video/spcaview/ChangeLog
+++ b/media-video/spcaview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/spcaview
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/ChangeLog,v 1.9 2007/03/24 22:21:23 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/ChangeLog,v 1.10 2007/07/13 22:04:15 vapier Exp $
+
+  13 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/spcaview-20061208-build.patch, spcaview-20061208.ebuild:
+  Make the build not suck at life and spread some ppc/ppc64 love.
 
   24 Mar 2007; Mike Doty <kingtaco@gentoo.org> Manifest:
   clean out old versions
diff --git a/media-video/spcaview/Manifest b/media-video/spcaview/Manifest
index 9ef69d915536..c9d1862f20ad 100644
--- a/media-video/spcaview/Manifest
+++ b/media-video/spcaview/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX spcaview-20061208-build.patch 3775 RMD160 fe7ca6d68ec928f6b64ba308be16b1348f2c814b SHA1 09e7348de82d9b02d8e6fe3177a2108b863ff9b8 SHA256 ffb12f33f4d604123c265dbcafd050ff795010acbc94e8b1423e64fe754bfd99
+MD5 f67c8d57d4bfc8c7b44975badea0d162 files/spcaview-20061208-build.patch 3775
+RMD160 fe7ca6d68ec928f6b64ba308be16b1348f2c814b files/spcaview-20061208-build.patch 3775
+SHA256 ffb12f33f4d604123c265dbcafd050ff795010acbc94e8b1423e64fe754bfd99 files/spcaview-20061208-build.patch 3775
 DIST spcaview-20061208.tar.gz 103896 RMD160 2f1808829b60b1282fa38d112d3a4da82e53e721 SHA1 39059c20d7e3b07c552ee9a9a662db7dbc742363 SHA256 10e3975a1965c27fadf672bcbfccdc43191e97b5a089e99c9fe099d4b44e3b30
-EBUILD spcaview-20061208.ebuild 606 RMD160 fb473d3d40610df2cbf299a8c4ec0d476fc52931 SHA1 4b4e0a2e1696712ad97e8976ebb6ad7b9438d3e4 SHA256 f558bb815630ec512127a36bbfc7327ea10eeeff1948de7c4111fd56c7df8981
-MD5 242aad56ffd37f2aeef3ea7e9003b668 spcaview-20061208.ebuild 606
-RMD160 fb473d3d40610df2cbf299a8c4ec0d476fc52931 spcaview-20061208.ebuild 606
-SHA256 f558bb815630ec512127a36bbfc7327ea10eeeff1948de7c4111fd56c7df8981 spcaview-20061208.ebuild 606
-MISC ChangeLog 1194 RMD160 d06b50eae5f339f614a155d247230c572784c5af SHA1 9499d49a8f6d80e31b16bfa0cbe08527328dabc3 SHA256 b6e312266b8158e509387d0340b0c8164b92ca09f101d9f10d9dd25aef148b09
-MD5 feb5e16ed89fef47b1e482c56bb51039 ChangeLog 1194
-RMD160 d06b50eae5f339f614a155d247230c572784c5af ChangeLog 1194
-SHA256 b6e312266b8158e509387d0340b0c8164b92ca09f101d9f10d9dd25aef148b09 ChangeLog 1194
+EBUILD spcaview-20061208.ebuild 722 RMD160 9175db306fdec84c9b3a094f79595f0247a74593 SHA1 97678e2069702b0f8df3abd71775b6b5b71f5fde SHA256 b00c5dfb8c373ba2b854c2fd0543779f7acb9dd04e4b5f7f1667fa41ce080a9a
+MD5 96c358c65ee7add404cf6733b0d61109 spcaview-20061208.ebuild 722
+RMD160 9175db306fdec84c9b3a094f79595f0247a74593 spcaview-20061208.ebuild 722
+SHA256 b00c5dfb8c373ba2b854c2fd0543779f7acb9dd04e4b5f7f1667fa41ce080a9a spcaview-20061208.ebuild 722
+MISC ChangeLog 1376 RMD160 ad644db2eedbe797f7f03fa9fff10a51408b4503 SHA1 523c8be9f511cafdb7fa6ab25b338efe2dba11ce SHA256 188fe42bb093675fa1568ba7b1af81cf9c509ab2174e0706f2a9d8f20d1b828a
+MD5 8621d0313084b94a083b5b549e7612e5 ChangeLog 1376
+RMD160 ad644db2eedbe797f7f03fa9fff10a51408b4503 ChangeLog 1376
+SHA256 188fe42bb093675fa1568ba7b1af81cf9c509ab2174e0706f2a9d8f20d1b828a ChangeLog 1376
 MISC metadata.xml 375 RMD160 6f1608823576c9b42b26173ba0b3a81a01f8db75 SHA1 fea13dba329853b71884ec55e406e3ef80338c09 SHA256 da2c5c4f65721e6f442ece0bab0934e2e2999a806bdc4e7096bd4914b00ddf1a
 MD5 becaea265ba32d5c39262974f827ef62 metadata.xml 375
 RMD160 6f1608823576c9b42b26173ba0b3a81a01f8db75 metadata.xml 375
@@ -18,11 +22,9 @@ MD5 8cf36ffa69c2285822ed2f48d6717042 files/digest-spcaview-20061208 253
 RMD160 f9337a411dee8a0a88002233cf2f0f1d468df23b files/digest-spcaview-20061208 253
 SHA256 9495e6ffe348405a8d8bc7fadacf7c13dc6f27dceddecea3d5d1feffe2c2a74e files/digest-spcaview-20061208 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iQCVAwUBRgWl2IBrouQZ9K4FAQIN6wQAx6uofOEuRjDkWhSVZ8mXCr2CaldAgv9n
-RUpqD5w7es4POBZVzT4u6l176CGQaZquq3hvisUx0I4YDFjxEwMFCpdtev+mCdRC
-+XJ1R083DLYh646LFxMM9O4pLlyE9KgYeHoZ5a6C99+ycmqd6z5fJdYmse97l5vU
-r+QToO3rMfM=
-=FlZM
+iD8DBQFGl/b2p/wUKkr7RBoRAvNYAJ9BvHrTw+eaSjeRV1cjJTt9D0B1LwCdHjOR
+87AP0HjwyzNa36OtrFsipRs=
+=gNfQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/spcaview/files/spcaview-20061208-build.patch b/media-video/spcaview/files/spcaview-20061208-build.patch
new file mode 100644
index 000000000000..3b806d809f4e
--- /dev/null
+++ b/media-video/spcaview/files/spcaview-20061208-build.patch
@@ -0,0 +1,134 @@
+--- Makefile
++++ Makefile
+@@ -2,10 +2,8 @@
+ # spcaview Makefile
+ ##############################
+ 
+-INSTALLROOT=$(PWD)
++DESTDIR=$(PWD)
+ 
+-CC=gcc
+-CPP=g++
+ INSTALL=install
+ APP_BINARY=spcaview
+ BIN=/usr/local/bin
+@@ -13,7 +11,6 @@
+ SDLLIBS = $(shell sdl-config --libs) 
+ SDLFLAGS = $(shell sdl-config --cflags)
+ 
+-SERVFLAGS= -O2 -DLINUX $(WARNINGS)
+ MATH_LIB=-lm 
+ SERVLIBS= $(MATH_LIB) -lpthread
+ 
+@@ -25,9 +22,8 @@
+ #           -Wno-unused
+ #           -Wunused
+ 
+-CFLAGS = -DUSE_SDL -O2 -DLINUX $(SDLFLAGS) $(WARNINGS)
+-CPPFLAGS = $(CFLAGS)
+-SHCFLAGS=  -O2 -ffast-math -fforce-addr -fstrict-aliasing -fomit-frame-pointer
++CFLAGS ?= -O2
++CFLAGS += $(SDLFLAGS) $(WARNINGS)
+ #CLIBFLAGS= -O9 -falign-functions=4 -march=athlon 
+ #LIB_ENCODE = libjpgenc.a
+ #LIB_ENCODE_OBJECTS = encoder.o huffman.o marker.o quant.o
+@@ -36,7 +32,7 @@
+ 		dpsh.o shc.o shclib.o\
+ 		audioin_devdsp.o SDL_audioin.o
+ 		
+-OBJSERVER= server.o spcav4l.o utils.o tcputils.o pargpio.o encoder.o huffman.o marker.o quant.o
++OBJSERVER= spcaserv.o spcav4l.o utils.o tcputils.o pargpio.o encoder.o huffman.o marker.o quant.o
+ 
+ OBJCAT= spcacat.o spcav4l.o utils.o picture.o pargpio.o encoder.o huffman.o marker.o quant.o avilib.o		
+ 
+@@ -52,74 +48,30 @@
+ 
+ # Applications:
+ spcaview:	$(OBJECTS)
+-	$(CC)	$(CFLAGS) $(OBJECTS) $(X11_LIB) $(XPM_LIB)\
+-		$(MATH_LIB) \
+-		$(SDLLIBS)\
+-		-o $(APP_BINARY)
+-	chmod 755 $(APP_BINARY)
+-
++spcaview:	LDLIBS += -lm $(SDLLIBS)
+ spcaserv: $(OBJSERVER)
+-	gcc $(SERVFLAGS) -o spcaserv $(OBJSERVER) $(SERVLIBS)
+-	
++spcaserv: LDLIBS += -lm -lpthread
+ spcacat: $(OBJCAT)
+-	gcc $(SERVFLAGS) -o spcacat $(OBJCAT) $(SERVLIBS)
++spcacat: LDLIBS += -lm -lpthread
+ 	
+-spcaview.o: spcaview.c  jconfig.h dpsh.h utils.h SDL_audioin.h
+-
+-
+-shc.o : shc.c shc.h
+-	$(CC) $(SHCFLAGS) -c -o $@ $<
+-shclib.o: shclib.c shclib.h
+-	$(CC) $(SHCFLAGS) -c -o $@ $<
+-dpsh.o: dpsh.c  dpsh.h
+-	$(CC) $(SHCFLAGS) -c -o $@ $<
++-include .depend
++.depend: $(wildcard *.c *.h)
++	$(CC) $(CPPFLAGS) -MM $^ > .depend
+ 
+-avilib.o: avilib.c avilib.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-	
+-server.o:	server.c
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-spcacat.o:	spcacat.c
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-	
+-spcav4l.o:	spcav4l.c spcav4l.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-utils.o:	utils.c utils.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-picture.o:	picture.c picture.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-pargpio.o:	pargpio.c pargpio.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-tcputils.o:	tcputils.c tcputils.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-encoder.o:	encoder.c encoder.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-huffman.o:	huffman.c huffman.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-marker.o:	marker.c marker.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+-quant.o:	quant.c quant.h
+-		$(CC) $(SERVFLAGS) -c -o $@ $<
+-		
+ install_spcaserv: spcaserv
+-	$(INSTALL) -s -m 755 -g root -o root spcaserv $(BIN) 
++	$(INSTALL) -m 755 -d $(DESTDIR)$(BIN)
++	$(INSTALL) -m 755 -g root -o root spcaserv $(DESTDIR)$(BIN) 
+ 	
+ install_spcacat: spcacat	
+-	$(INSTALL) -s -m 755 -g root -o root spcacat $(BIN)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(BIN)
++	$(INSTALL) -m 755 -g root -o root spcacat $(DESTDIR)$(BIN)
+ 
+ install_spcaview: spcaview
+-	 $(INSTALL) -s -m 755 -g root -o root spcaview $(BIN)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(BIN)
++	$(INSTALL) -m 755 -g root -o root spcaview $(DESTDIR)$(BIN)
+ 	 
+ install: spcaview spcaserv spcacat
+-	$(INSTALL) -s -m 755 -g root -o root spcaview $(BIN) 
+-	$(INSTALL) -s -m 755 -g root -o root spcaserv $(BIN) 
+-	$(INSTALL) -s -m 755 -g root -o root spcacat $(BIN) 
++	$(INSTALL) -m 755 -d $(DESTDIR)$(BIN)
++	$(INSTALL) -m 755 -g root -o root spcaview $(DESTDIR)$(BIN) 
++	$(INSTALL) -m 755 -g root -o root spcaserv $(DESTDIR)$(BIN) 
++	$(INSTALL) -m 755 -g root -o root spcacat $(DESTDIR)$(BIN) 
diff --git a/media-video/spcaview/spcaview-20061208.ebuild b/media-video/spcaview/spcaview-20061208.ebuild
index 6eb93519e77c..5383e613962b 100644
--- a/media-video/spcaview/spcaview-20061208.ebuild
+++ b/media-video/spcaview/spcaview-20061208.ebuild
@@ -1,20 +1,29 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/spcaview-20061208.ebuild,v 1.1 2007/03/10 19:18:51 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/spcaview-20061208.ebuild,v 1.2 2007/07/13 22:04:15 vapier Exp $
 
-DESCRIPTION="A webcam viewer for the spca5xx driver."
+inherit eutils
+
+DESCRIPTION="A webcam viewer for the spca5xx driver"
 HOMEPAGE="http://mxhaard.free.fr/sview.html"
 SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
+
 DEPEND="media-libs/libsdl"
-RDEPEND="${DEPEND}"
-RESTRICT=strip
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv server.c spcaserv.c
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i '/^BIN/s:/local::' Makefile
+}
 
 src_install() {
-	dodir /usr/bin
-	make BIN=${D}/usr/bin install || die
+	emake DESTDIR="${D}" install || die
 	dodoc README Changelog
 }