Cleanup the build system some more and fix asm build errors in mmx code #152002 by Thomas Tuttle.

Package-Manager: portage-2.1.2_pre3-r5

7 files changed, 158 insertions, 32 deletions

diff --git a/media-video/SDLcam/ChangeLog b/media-video/SDLcam/ChangeLog
index 97a4a092833b..dd19b3662d7e 100644
--- a/media-video/SDLcam/ChangeLog
+++ b/media-video/SDLcam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/SDLcam
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.8 2006/10/22 05:36:10 vapier Exp $
+
+  22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  files/SDLcam-0.7.3-build.patch, +files/SDLcam-0.7.3-jpeg.patch,
+  files/SDLcam-0.7.3-prototypes.patch, +files/SDLcam-0.7.3-relax-asm.patch,
+  SDLcam-0.7.3-r2.ebuild:
+  Cleanup the build system some more and fix asm build errors in mmx code
+  #152002 by Thomas Tuttle.
 
   30 Sep 2006; Mike Frysinger <vapier@gentoo.org>
   +files/SDLcam-0.7.3-build.patch, -files/0.7.3-no-divx.patch,
diff --git a/media-video/SDLcam/Manifest b/media-video/SDLcam/Manifest
index 0533c6b3d4d0..034b41306897 100644
--- a/media-video/SDLcam/Manifest
+++ b/media-video/SDLcam/Manifest
@@ -9,45 +9,46 @@ AUX 0.7.3-linux-2.6.patch 517 RMD160 89d492a11f55417b58e3428b5e76b64f463a8d34 SH
 MD5 eb83f71dceccfba016349f3f2cf22538 files/0.7.3-linux-2.6.patch 517
 RMD160 89d492a11f55417b58e3428b5e76b64f463a8d34 files/0.7.3-linux-2.6.patch 517
 SHA256 51462c4624576ad434d45157dfe62dfb120f49fb4889ffa2bdf1ba65e8638e85 files/0.7.3-linux-2.6.patch 517
-AUX SDLcam-0.7.3-build.patch 2055 RMD160 08a485556af44666ba7ea4439223b848c4f76aea SHA1 7548668f733cb15c68b104f2d01a6a57c95d9a62 SHA256 cc89c19a5b2967eec86d3e4a79b770d0551e0fdee687383c3fe59da74479185a
-MD5 cdc6091144c5f6442f591df4204daeef files/SDLcam-0.7.3-build.patch 2055
-RMD160 08a485556af44666ba7ea4439223b848c4f76aea files/SDLcam-0.7.3-build.patch 2055
-SHA256 cc89c19a5b2967eec86d3e4a79b770d0551e0fdee687383c3fe59da74479185a files/SDLcam-0.7.3-build.patch 2055
-AUX SDLcam-0.7.3-prototypes.patch 1490 RMD160 bf9325b4f43be26bd3a2e9b54afc2a3bda5f0218 SHA1 cbf7591d00c0267493e0a7e31abf9b63d839f691 SHA256 271d56108244111b978aeecdd126aa3c5fba4a50fcf0bac7a17cc453b78b409f
-MD5 966ce0738aa2f731a83cd85d8c490aa7 files/SDLcam-0.7.3-prototypes.patch 1490
-RMD160 bf9325b4f43be26bd3a2e9b54afc2a3bda5f0218 files/SDLcam-0.7.3-prototypes.patch 1490
-SHA256 271d56108244111b978aeecdd126aa3c5fba4a50fcf0bac7a17cc453b78b409f files/SDLcam-0.7.3-prototypes.patch 1490
+AUX SDLcam-0.7.3-build.patch 2258 RMD160 321a61e8473910c2c62b73fa17521e8a514ad46f SHA1 6d0a614e3cb759c87ffb764026733e87ccd09ad0 SHA256 ba6fc348a3c0ad5dc52e3ce81b2f81a737247fefe108cd8137e7348d1dae2570
+MD5 cec5cdbb47ce5c84fe93fae394779c5a files/SDLcam-0.7.3-build.patch 2258
+RMD160 321a61e8473910c2c62b73fa17521e8a514ad46f files/SDLcam-0.7.3-build.patch 2258
+SHA256 ba6fc348a3c0ad5dc52e3ce81b2f81a737247fefe108cd8137e7348d1dae2570 files/SDLcam-0.7.3-build.patch 2258
+AUX SDLcam-0.7.3-jpeg.patch 307 RMD160 af95851dec96d4ad51ef09453ea935db063c3887 SHA1 f4e2739f5f3cc5ae7714ad15f40e9f524e822c16 SHA256 e777fefa034ae738b9e89c28e3a7292c43dcddb7733a0f48517f13b717e0cc89
+MD5 37d428416241c64349768aa57bba3975 files/SDLcam-0.7.3-jpeg.patch 307
+RMD160 af95851dec96d4ad51ef09453ea935db063c3887 files/SDLcam-0.7.3-jpeg.patch 307
+SHA256 e777fefa034ae738b9e89c28e3a7292c43dcddb7733a0f48517f13b717e0cc89 files/SDLcam-0.7.3-jpeg.patch 307
+AUX SDLcam-0.7.3-prototypes.patch 1933 RMD160 28e42d47cb03929aba09856dc8af38e4433ad969 SHA1 fd1dcd2c39cb94df28209373fc1400ff7920c039 SHA256 69151b38a679a045f891aada7b9389ef701c2240d029660d18541d9110a9a15f
+MD5 9c1a0ad8f4fd03796474cc58f6223c2a files/SDLcam-0.7.3-prototypes.patch 1933
+RMD160 28e42d47cb03929aba09856dc8af38e4433ad969 files/SDLcam-0.7.3-prototypes.patch 1933
+SHA256 69151b38a679a045f891aada7b9389ef701c2240d029660d18541d9110a9a15f files/SDLcam-0.7.3-prototypes.patch 1933
+AUX SDLcam-0.7.3-relax-asm.patch 2009 RMD160 0385380cc2df626d44e8252eda1dced6ff366751 SHA1 03f1dde1e4b5af4eac92d919c6e8f2fad5ff7174 SHA256 b41d763291884ab197fba1d105aa66ce16de983830ac4dd31fceee2e03e56379
+MD5 e5e6f6cd88be11ee53fdcb6565b59a3f files/SDLcam-0.7.3-relax-asm.patch 2009
+RMD160 0385380cc2df626d44e8252eda1dced6ff366751 files/SDLcam-0.7.3-relax-asm.patch 2009
+SHA256 b41d763291884ab197fba1d105aa66ce16de983830ac4dd31fceee2e03e56379 files/SDLcam-0.7.3-relax-asm.patch 2009
 AUX SDLcam-0.7.3-tsc.patch 1172 RMD160 2b8afa3ae671ab81cb05f0d8b846da7ae0bbaed5 SHA1 43310b864fea72578d8a2f28f19ffdaf97ef584e SHA256 69be7e9576f289ff0c8107d9ea6574c1361412668c4910f25533a8fb4524578c
 MD5 6a6efe94d07cda44c908c7cf8fcfcc2a files/SDLcam-0.7.3-tsc.patch 1172
 RMD160 2b8afa3ae671ab81cb05f0d8b846da7ae0bbaed5 files/SDLcam-0.7.3-tsc.patch 1172
 SHA256 69be7e9576f289ff0c8107d9ea6574c1361412668c4910f25533a8fb4524578c files/SDLcam-0.7.3-tsc.patch 1172
 DIST SDLcam-0.7.3.tar.gz 299421 RMD160 bb59dadae8a2ac4f5f86b16abb298a498e25a5eb SHA1 d6c3945f51bb1c5a6701652a06fe752f273b2ef9 SHA256 227e44ab23fd3081e170a61fac81f8920cf8f4c34d92ea57ce61fd056674c6a4
-EBUILD SDLcam-0.7.3-r1.ebuild 1517 RMD160 545e64343ad2839e5032f3ff196f106154f8191f SHA1 26e5aacffb98fce6ebdcc1fc73bbdc9313367c8f SHA256 e2e5d391b1b558927eb0941f310806988be88a3f6655523ba5b0b8e562f4bfb2
-MD5 7b80507b7eb8ac2429c56569cd60cc3d SDLcam-0.7.3-r1.ebuild 1517
-RMD160 545e64343ad2839e5032f3ff196f106154f8191f SDLcam-0.7.3-r1.ebuild 1517
-SHA256 e2e5d391b1b558927eb0941f310806988be88a3f6655523ba5b0b8e562f4bfb2 SDLcam-0.7.3-r1.ebuild 1517
-EBUILD SDLcam-0.7.3-r2.ebuild 1516 RMD160 0f13ba6fddf0977b1f9fad19901de8ce1b56e42a SHA1 31504dee91c8ce8693f7ede3c041fdbd44dca070 SHA256 573d61372eb0988fd1a2f3ba103b60197b1b3deab1df741817c8468c3f8ed610
-MD5 f6c3b8e5a0ce5e3c9d72b3ed47d9819b SDLcam-0.7.3-r2.ebuild 1516
-RMD160 0f13ba6fddf0977b1f9fad19901de8ce1b56e42a SDLcam-0.7.3-r2.ebuild 1516
-SHA256 573d61372eb0988fd1a2f3ba103b60197b1b3deab1df741817c8468c3f8ed610 SDLcam-0.7.3-r2.ebuild 1516
-MISC ChangeLog 1230 RMD160 82dff044a7da27a52cfa6c51430e29a35c75eb1b SHA1 0d4747f9f2f8da85b3ac608913bd345bc5f8466b SHA256 b6a82aa26dc0107a3728a12e03ed659964a5acf72f5fd4c8707367d372d248d9
-MD5 c908dba815768e51bf70f85be9bdd997 ChangeLog 1230
-RMD160 82dff044a7da27a52cfa6c51430e29a35c75eb1b ChangeLog 1230
-SHA256 b6a82aa26dc0107a3728a12e03ed659964a5acf72f5fd4c8707367d372d248d9 ChangeLog 1230
+EBUILD SDLcam-0.7.3-r2.ebuild 1603 RMD160 ad8e225a231cb402cdf594aa82a3874d8fdaa868 SHA1 65206d705b7d0c364aea1a4fc0221dc36e9f216a SHA256 740020e28ef531487425d9d169b9c1962b562a40080911881356c3aa6d1ca737
+MD5 f2fbe42e8368770bd2ee52075dadfab3 SDLcam-0.7.3-r2.ebuild 1603
+RMD160 ad8e225a231cb402cdf594aa82a3874d8fdaa868 SDLcam-0.7.3-r2.ebuild 1603
+SHA256 740020e28ef531487425d9d169b9c1962b562a40080911881356c3aa6d1ca737 SDLcam-0.7.3-r2.ebuild 1603
+MISC ChangeLog 1551 RMD160 30df955eaf24a6d20bfbd9177d14eb2e760cdf27 SHA1 0a9ae5207fc2a3f991032290849aba683930adff SHA256 cf8551df69006ab7647d6c5d68678d256d451b5e25334c5daa7f3302d910e193
+MD5 2b3fd9e3f4c702a04ce0c3ab8d78ec5d ChangeLog 1551
+RMD160 30df955eaf24a6d20bfbd9177d14eb2e760cdf27 ChangeLog 1551
+SHA256 cf8551df69006ab7647d6c5d68678d256d451b5e25334c5daa7f3302d910e193 ChangeLog 1551
 MISC metadata.xml 579 RMD160 6e275c3fac48efbd4b422f2d3ea85500e20c9157 SHA1 09a520db73ada60d7f641107e2d6701b4e09ecd3 SHA256 3107244e2ed520c02b9958babf40e125e379af93997c10c812f1037a2feb6f67
 MD5 9c86830b089cab3e08a1f927b14d78b9 metadata.xml 579
 RMD160 6e275c3fac48efbd4b422f2d3ea85500e20c9157 metadata.xml 579
 SHA256 3107244e2ed520c02b9958babf40e125e379af93997c10c812f1037a2feb6f67 metadata.xml 579
-MD5 dc3fce4f940f7484e2b73c11ae7f3911 files/digest-SDLcam-0.7.3-r1 238
-RMD160 ad2abc43311635ad8aab584722540bd7d41cd58f files/digest-SDLcam-0.7.3-r1 238
-SHA256 a56fff67a8837d64c109b33ad4cf37d36dcf0647dfddb2ccdfbfe5816ff51c6b files/digest-SDLcam-0.7.3-r1 238
 MD5 dc3fce4f940f7484e2b73c11ae7f3911 files/digest-SDLcam-0.7.3-r2 238
 RMD160 ad2abc43311635ad8aab584722540bd7d41cd58f files/digest-SDLcam-0.7.3-r2 238
 SHA256 a56fff67a8837d64c109b33ad4cf37d36dcf0647dfddb2ccdfbfe5816ff51c6b files/digest-SDLcam-0.7.3-r2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHr/NamhnQswr0vIRAiapAJ9l7yYhDHMgU9NJdcvDcYAvCArBUwCgvxyc
-jjeR7NvdWwFfyoLjSyzA5mw=
-=w/mb
+iD8DBQFFOwNyamhnQswr0vIRAr4fAKCuWVko6Fdgh9ekSRq+E1h86/lxSQCeLT0K
+/KnbK8kjykpmHYh1xitWnzY=
+=miad
 -----END PGP SIGNATURE-----
diff --git a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
index c7fd25592534..e9aa8fe33720 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-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.2 2006/09/30 19:04:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild,v 1.3 2006/10/22 05:36:10 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://sdlcam.raphnet.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2
@@ -23,11 +23,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-gcc3.patch
-	rm capture/divx.c   # the divx.so needs to be ported to newer avifile
+	rm capture/divx*   # 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
 	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-relax-asm.patch #152002
+	epatch "${FILESDIR}"/${P}-jpeg.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
index ecbead404887..b7a83aa49246 100644
--- a/media-video/SDLcam/files/SDLcam-0.7.3-build.patch
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-build.patch
@@ -21,7 +21,7 @@
  
  
  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 @@
+@@ -31,32 +32,30 @@
  	./install
  
  %.o: %.cpp
@@ -57,4 +57,9 @@
 +	$(CXX) $(CXXFLAGS) -fPIC -shared -o $@ $? $(LDFLAGS)
  
  SDLcam: $(OBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) -o $(PROG) 
+-	$(LD) $(LDFLAGS) $(OBJS) -o $(PROG) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $(PROG) 
+ #	$(LD) $(LDFLAGS) $(OBJS) -o $(PROG) -laviplay
+ 
+-SDL_v4l_filters_thomas.o: SDL_v4l_filters_thomas.c
+-	$(CC) $(MMXFLAGS) -c SDL_v4l_filters_thomas.c
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-jpeg.patch b/media-video/SDLcam/files/SDLcam-0.7.3-jpeg.patch
new file mode 100644
index 000000000000..5a64286ed747
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-jpeg.patch
@@ -0,0 +1,14 @@
+make sure we always include jpeglib.h
+
+--- dump_thomas.c
++++ dump_thomas.c
+@@ -29,8 +29,8 @@
+ 
+ #ifdef __cplusplus
+ extern "C" {
+-#include <jpeglib.h>
+ #endif
++#include <jpeglib.h>
+ 
+ int write_file_jpeg (char *file_name, unsigned char *data, int width, int height) {{{
+   struct jpeg_compress_struct jpeg;
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 05056f1e96ca..c69612fe201d 100644
--- a/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
@@ -30,3 +30,26 @@
  	int diry = image->w;
  	int xinc = 1;
  	int yinc = 1;
+--- SDL_v4l_image.h
++++ SDL_v4l_image.h
+@@ -1,5 +1,10 @@
+ #ifndef SDL_V4L_IMAGE_H
+ #define	SDL_V4L_IMAGE_H
++
++#include <string.h>
++#include <stdio.h>
++#include <unistd.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--- filter/Barcode.c
++++ filter/Barcode.c
+@@ -22,6 +22,7 @@
+ // TODO: Add support for UPC_E, EAN_13, EAN_8 and CODE_39
+ // TODO: Add vertical and diagonal scanning
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <math.h>
+ 
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-relax-asm.patch b/media-video/SDLcam/files/SDLcam-0.7.3-relax-asm.patch
new file mode 100644
index 000000000000..e24558c8c0ab
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-relax-asm.patch
@@ -0,0 +1,74 @@
+fix build errors:
+
+SDL_v4l_filters_thomas.c: In function 'MMX_add_sub_shr':
+SDL_v4l_filters_thomas.c:50: error: memory input 3 is not directly addressable
+SDL_v4l_filters_thomas.c: In function 'yuv420p_to_rgb32':
+SDL_v4l_filters_thomas.c:154: error: memory input 4 is not directly addressable
+SDL_v4l_filters_thomas.c:154: error: memory input 5 is not directly addressable
+SDL_v4l_filters_thomas.c: In function 'yuv420p_to_bgr32':
+SDL_v4l_filters_thomas.c:256: error: memory input 4 is not directly addressable
+SDL_v4l_filters_thomas.c:256: error: memory input 5 is not directly addressable
+
+filter/Bluebox.c: In function 'Apply':
+filter/Bluebox.c:57: error: memory input 2 is not directly addressable
+
+filter/Trashmask.c: In function 'Apply':
+filter/Trashmask.c:58: error: memory input 2 is not directly addressable
+
+http://bugs.gentoo.org/152002
+
+--- SDL_v4l_filters_thomas.c
++++ SDL_v4l_filters_thomas.c
+@@ -94,7 +94,7 @@
+ 		: "=m"  (bild)		// %0
+ 		:"m"    (buf),		// %1
+ 		 "m"	(summe),	// %2
+-		 "m"	(SHIFT),	// %3
++		 "g"	(SHIFT),	// %3
+ 		 "m"	(len)		// %4
+ 		);
+ 	return 1;
+@@ -226,8 +226,8 @@
+ 			:  "m"  (u),		//%1
+ 			   "m"  (v),		//%2
+ 			   "m"  (d),		//%3
+-			   "m"  (ng_clip),	//%4
+-			   "m"	(ng_yuv_g2)	//%5
++			   "g"  (ng_clip),	//%4
++			   "g"	(ng_yuv_g2)	//%5
+ 				     );
+ 			d+=8;
+ 			y+=2; 
+@@ -328,8 +328,8 @@
+ 			:  "m"  (u),		//%1
+ 			   "m"  (v),		//%2
+ 			   "m"  (d),		//%3
+-			   "m"  (ng_clip),	//%4
+-			   "m"	(ng_yuv_g2)	//%5
++			   "g"  (ng_clip),	//%4
++			   "g"	(ng_yuv_g2)	//%5
+ 				     );
+ 			d+=8;
+ 			y+=2; 
+--- filter/Bluebox.c
++++ filter/Bluebox.c
+@@ -120,7 +120,7 @@
+ 	"	pop		%%ebx				\n"
+ 		: "=m"  (buf)		// %0
+ 		:"m"    (dat),		// %1
+-		 "m"	(MASK),		// %2
++		 "g"	(MASK),		// %2
+ 		 "m"	(len)		// %3
+ 		);
+ 	/* }}} */
+--- filter/Trashmask.c
++++ filter/Trashmask.c
+@@ -96,7 +96,7 @@
+ 	"	pop		%%ecx			\n"
+ 		: "=m"  (src)		// %0
+ 		: "m"	(dst),		// %1 
+-		 "m"    (MASK),         // %2
++		 "g"    (MASK),         // %2
+ 		 "m"	(len)		// %3
+ 		);
+ 	/* }}} */