diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-13 14:38:02 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-13 14:38:02 +0000 |
commit | e7e4c522c7db86eefacc24de62a5433da00f4b9b (patch) | |
tree | 41750a2831a82ab0aecfb1a478deca81cd92441e /media-video/SDLcam | |
parent | old (diff) | |
download | gentoo-2-e7e4c522c7db86eefacc24de62a5433da00f4b9b.tar.gz gentoo-2-e7e4c522c7db86eefacc24de62a5433da00f4b9b.tar.bz2 gentoo-2-e7e4c522c7db86eefacc24de62a5433da00f4b9b.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video/SDLcam')
-rw-r--r-- | media-video/SDLcam/Manifest | 11 | ||||
-rw-r--r-- | media-video/SDLcam/SDLcam-0.7.3-r2.ebuild | 55 | ||||
-rw-r--r-- | media-video/SDLcam/files/0.7.3-gcc3.patch | 102 | ||||
-rw-r--r-- | media-video/SDLcam/files/0.7.3-linux-2.6.patch | 20 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.7.3-build.patch | 65 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.7.3-jpeg.patch | 14 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch | 55 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.7.3-relax-asm.patch | 74 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch | 51 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.8.0-build.patch | 70 | ||||
-rw-r--r-- | media-video/SDLcam/files/SDLcam-0.8.1-build.patch | 24 |
11 files changed, 0 insertions, 541 deletions
diff --git a/media-video/SDLcam/Manifest b/media-video/SDLcam/Manifest index 8a1cbdbef27b..eb86f011e129 100644 --- a/media-video/SDLcam/Manifest +++ b/media-video/SDLcam/Manifest @@ -1,16 +1,5 @@ -AUX 0.7.3-gcc3.patch 3271 RMD160 129c0fe495f713cba59077658a75fbe905c3c27a SHA1 39c5325d5ccf30f9f30c9f66b87640eb170e1c5b SHA256 ff35f4e0118176f4b107eae2c724dfaae163ed0db7d6739212da1bcec6bf9022 -AUX 0.7.3-linux-2.6.patch 517 RMD160 89d492a11f55417b58e3428b5e76b64f463a8d34 SHA1 ca17755d80fd28505c320344dea7fcbe6c9e2f63 SHA256 51462c4624576ad434d45157dfe62dfb120f49fb4889ffa2bdf1ba65e8638e85 -AUX SDLcam-0.7.3-build.patch 2258 RMD160 321a61e8473910c2c62b73fa17521e8a514ad46f SHA1 6d0a614e3cb759c87ffb764026733e87ccd09ad0 SHA256 ba6fc348a3c0ad5dc52e3ce81b2f81a737247fefe108cd8137e7348d1dae2570 -AUX SDLcam-0.7.3-jpeg.patch 307 RMD160 af95851dec96d4ad51ef09453ea935db063c3887 SHA1 f4e2739f5f3cc5ae7714ad15f40e9f524e822c16 SHA256 e777fefa034ae738b9e89c28e3a7292c43dcddb7733a0f48517f13b717e0cc89 -AUX SDLcam-0.7.3-prototypes.patch 1933 RMD160 28e42d47cb03929aba09856dc8af38e4433ad969 SHA1 fd1dcd2c39cb94df28209373fc1400ff7920c039 SHA256 69151b38a679a045f891aada7b9389ef701c2240d029660d18541d9110a9a15f -AUX SDLcam-0.7.3-relax-asm.patch 2009 RMD160 0385380cc2df626d44e8252eda1dced6ff366751 SHA1 03f1dde1e4b5af4eac92d919c6e8f2fad5ff7174 SHA256 b41d763291884ab197fba1d105aa66ce16de983830ac4dd31fceee2e03e56379 -AUX SDLcam-0.7.3-tsc.patch 1172 RMD160 2b8afa3ae671ab81cb05f0d8b846da7ae0bbaed5 SHA1 43310b864fea72578d8a2f28f19ffdaf97ef584e SHA256 69be7e9576f289ff0c8107d9ea6574c1361412668c4910f25533a8fb4524578c -AUX SDLcam-0.8.0-build.patch 2557 RMD160 c2cae27b06c9690936cddbb505bb7782c788b3f1 SHA1 2405811983dde3cbfff3b9f928f2975cda2f8ad0 SHA256 24946a8d22488679c4e627c0b8bda860fcb1ff8555bef0afd8dd8fd4337c9f5d -AUX SDLcam-0.8.1-build.patch 852 RMD160 d5661caa5d66fb64a87a2353e22dab6ef023e3f1 SHA1 55da5f35764163e769466596a18b5af64b84dadd SHA256 7555e167a8e17af4308d25b73a6afc506efa6dbf0ee7f97b7ba69723f78f9fb9 AUX SDLcam-glibc210.patch 549 RMD160 e905b36660f569867f98e31fcec79d47f1021e92 SHA1 a9aafac154a6f3979b2882da0d8aa7d62d5e9582 SHA256 28a1a1944dd4056853384143f0fe81dd9ee9956766d521cc9bf3a427ba18a67a -DIST SDLcam-0.7.3.tar.gz 299421 RMD160 bb59dadae8a2ac4f5f86b16abb298a498e25a5eb SHA1 d6c3945f51bb1c5a6701652a06fe752f273b2ef9 SHA256 227e44ab23fd3081e170a61fac81f8920cf8f4c34d92ea57ce61fd056674c6a4 DIST sdlcam-0.8.2.tar.gz 617089 RMD160 2523840ea3bcd98938c9003c5b38249aba2e2a43 SHA1 6a2caf62d01b92c8a6f76a6dbf908cd7630fea8e SHA256 5acb6bb01615a9f501667117d756d53af1b52e1f3300b0db5ca8061d1fd33216 -EBUILD SDLcam-0.7.3-r2.ebuild 1633 RMD160 b539e8f44dec164a1ff55e6d8bac3ce6b65cd621 SHA1 1e93fd33dd8559d7f5c797fabd0f6768c1dfa18d SHA256 e0143ebac253f199dd57ec249f79649e752f31a45b90325702c68ded848ee94e EBUILD SDLcam-0.8.2.ebuild 863 RMD160 0742d7493eac3e52d38c8759419446f4dbf16e28 SHA1 9ae04f4a9eb6d6d73e6f220410ceda9b0c3883e0 SHA256 3ec6a23d526d28a630283e5df36b39e275460b4a6b63bcbd817f6572e0ccd9da MISC ChangeLog 2464 RMD160 fe5ba3c24f6ad4f2914fb5b2092d9f74d9110160 SHA1 bec0f0dc37b3d4b4def35ee002b8965ef6361d0f SHA256 f40bec4dcdedd9b41b21a1cad733626deb80f797b1e73531ea3cb04e3a9c1880 MISC metadata.xml 515 RMD160 2965fdfa1ece2c3c11fd4eaea345b691248fdee9 SHA1 887d27078d6c4a75a8078f0065cd5d7b7add787f SHA256 e5aab75f654a9654af0670d085e45f5e491bdcb20f18ca3dd92b96bd7d68ebbf diff --git a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild deleted file mode 100644 index 8229d712c703..000000000000 --- a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2009 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.5 2009/08/08 20:44:56 vostorga Exp $ - -inherit eutils - -DESCRIPTION="Webcam application that uses the SDL library" -HOMEPAGE="http://sdlcam.raphnet.net/" -SRC_URI="http://sdlcam.raphnet.net/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND="dev-libs/libxml2 - media-libs/jpeg - media-libs/libpng - media-libs/libfame - media-libs/libsdl - media-libs/sdl-image - media-libs/sdl-ttf" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PV}-gcc3.patch - 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 - epatch "${FILESDIR}"/${PN}-glibc210.patch - - # Don't you love hardcoded vars? - sed -i \ - -e 's:/usr/local/share/SDLcam/:/usr/share/SDLcam/:' \ - -e 's:/usr/local/lib/SDLcam:/usr/lib/SDLcam:' \ - -e 's:sources/:/usr/lib/SDLcam/sources/:' \ - configuration.h interface.cpp SDL_v4l_filters.c main.cpp -} - -src_install() { - dobin SDLcam || die - insinto /usr/share/SDLcam - doins LucidaSansRegular.ttf LucidaTypewriterRegular.ttf SDLcam.xml SDLcam.cfg || die - insinto /usr/lib/SDLcam/filters - doins filter/*.so || die - insinto /usr/lib/SDLcam/capture - doins capture/*.so || die - insinto /usr/lib/SDLcam/sources - doins sources/*.so || die -} diff --git a/media-video/SDLcam/files/0.7.3-gcc3.patch b/media-video/SDLcam/files/0.7.3-gcc3.patch deleted file mode 100644 index a168263f529b..000000000000 --- a/media-video/SDLcam/files/0.7.3-gcc3.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- filter/Absdiff.c 2002-08-25 17:54:47.000000000 -0400 -+++ filter/Absdiff.c?rt=sdlcam&r=1.3&p=1 2003-09-10 00:33:39.213153784 -0400 -@@ -33,53 +33,52 @@ - #ifdef MMX - /* {{{ D = [A-B] OR [B-A] ; [] mean sturated to 0 */ - if (len < 8) return 0; // image size must be at least 8 bytes -- asm volatile (" -- push %%ebx -- push %%ecx -- push %%esi -- push %%edi -- mov %3, %%ecx -- mov %2, %%edi -- mov %1, %%ebx -- mov %0, %%esi -- shr $5, %%ecx -- .align 16 -- .absdiff_MMX: -- movq (%%esi), %%mm0 -- movq 8(%%esi), %%mm1 -- movq 16(%%esi), %%mm2 -- movq 24(%%esi), %%mm3 -- movq (%%ebx), %%mm4 -- movq 8(%%ebx), %%mm5 -- movq 16(%%ebx), %%mm6 -- movq 24(%%ebx), %%mm7 -- psubusb %%mm4 , %%mm0 -- psubusb %%mm5 , %%mm1 -- psubusb %%mm6 , %%mm2 -- psubusb %%mm7 , %%mm3 -- psubusb (%%esi), %%mm4 -- psubusb 8(%%esi), %%mm5 -- psubusb 16(%%esi), %%mm6 -- psubusb 24(%%esi), %%mm7 -- por %%mm4 , %%mm0 -- por %%mm5 , %%mm1 -- por %%mm6 , %%mm2 -- por %%mm7 , %%mm3 -- movq %%mm0, (%%edi) -- movq %%mm1, 8(%%edi) -- movq %%mm2, 16(%%edi) -- movq %%mm3, 24(%%edi) -- add $32, %%esi -- add $32, %%edi -- add $32, %%ebx -- dec %%ecx -- jnz .absdiff_MMX -- emms -- pop %%edi -- pop %%esi -- pop %%ecx -- pop %%ebx -- " -+ asm volatile ( -+ " push %%ebx \n" -+ " push %%ecx \n" -+ " push %%esi \n" -+ " push %%edi \n" -+ " mov %3, %%ecx \n" -+ " mov %2, %%edi \n" -+ " mov %1, %%ebx \n" -+ " mov %0, %%esi \n" -+ " shr $5, %%ecx \n" -+ ".align 16 \n" -+ ".absdiff_MMX: \n" -+ " movq (%%esi), %%mm0 \n" -+ " movq 8(%%esi), %%mm1 \n" -+ " movq 16(%%esi), %%mm2 \n" -+ " movq 24(%%esi), %%mm3 \n" -+ " movq (%%ebx), %%mm4 \n" -+ " movq 8(%%ebx), %%mm5 \n" -+ " movq 16(%%ebx), %%mm6 \n" -+ " movq 24(%%ebx), %%mm7 \n" -+ " psubusb %%mm4 , %%mm0 \n" -+ " psubusb %%mm5 , %%mm1 \n" -+ " psubusb %%mm6 , %%mm2 \n" -+ " psubusb %%mm7 , %%mm3 \n" -+ " psubusb (%%esi), %%mm4 \n" -+ " psubusb 8(%%esi), %%mm5 \n" -+ " psubusb 16(%%esi), %%mm6 \n" -+ " psubusb 24(%%esi), %%mm7 \n" -+ " por %%mm4 , %%mm0 \n" -+ " por %%mm5 , %%mm1 \n" -+ " por %%mm6 , %%mm2 \n" -+ " por %%mm7 , %%mm3 \n" -+ " movq %%mm0, (%%edi) \n" -+ " movq %%mm1, 8(%%edi) \n" -+ " movq %%mm2, 16(%%edi) \n" -+ " movq %%mm3, 24(%%edi) \n" -+ " add $32, %%esi \n" -+ " add $32, %%edi \n" -+ " add $32, %%ebx \n" -+ " dec %%ecx \n" -+ " jnz .absdiff_MMX \n" -+ " emms \n" -+ " pop %%edi \n" -+ " pop %%esi \n" -+ " pop %%ecx \n" -+ " pop %%ebx \n" - : "=m" (b) // %0 - :"m" (a), // %1 - "m" (dst), // %2 diff --git a/media-video/SDLcam/files/0.7.3-linux-2.6.patch b/media-video/SDLcam/files/0.7.3-linux-2.6.patch deleted file mode 100644 index cd3c88e5c4f3..000000000000 --- a/media-video/SDLcam/files/0.7.3-linux-2.6.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- SDL_v4l.h.orig 2004-01-30 04:14:33.285992128 -0500 -+++ SDL_v4l.h 2004-01-30 04:14:39.870991056 -0500 -@@ -21,6 +21,7 @@ - - #include "SDL.h" - #include "SDL_v4l_filters.h" -+#define _LINUX_TIME_H - #include <linux/videodev.h> - #include "input.h" - ---- webcam.cpp.orig 2004-01-30 04:14:52.689042416 -0500 -+++ webcam.cpp 2004-01-30 04:15:01.355724880 -0500 -@@ -25,6 +25,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#define _LINUX_TIME_H - #include <linux/videodev.h> - #include <sys/ioctl.h> - diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-build.patch b/media-video/SDLcam/files/SDLcam-0.7.3-build.patch deleted file mode 100644 index b7a83aa49246..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.7.3-build.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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,32 +32,30 @@ - ./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) -+ $(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 deleted file mode 100644 index 5a64286ed747..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.7.3-jpeg.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index c69612fe201d..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- SDL_v4l_filters_thomas.h -+++ SDL_v4l_filters_thomas.h -@@ -18,6 +18,7 @@ - */ - #ifndef FILTER_THOMAS_H - #define FILTER_THOMAS_H -+#include <sys/types.h> - #ifdef __cplusplus - extern "C" { - #endif -@@ -29,8 +30,8 @@ - #ifdef MMX - int MMX_add_sub_shr (unsigned char *bild, unsigned char *buf, unsigned short *summe, unsigned int len, unsigned int shr); - #endif --void yuv420p_to_rgb32(unsigned int width,unsigned int height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d); --void yuv420p_to_bgr32(unsigned int width,unsigned int height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d); -+void yuv420p_to_rgb32(size_t width,size_t height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d); -+void yuv420p_to_bgr32(size_t width,size_t height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d); - 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; ---- 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 deleted file mode 100644 index e24558c8c0ab..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.7.3-relax-asm.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 - ); - /* }}} */ diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch b/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch deleted file mode 100644 index 807667b22a5d..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch +++ /dev/null @@ -1,51 +0,0 @@ -Patch by Tobias Klausmann to fix TSC issues on Pentium M's - -http://bugs.gentoo.org/109161 - ---- misc.c -+++ misc.c -@@ -25,6 +25,11 @@ - #include "dyn_misc.h" - #include "misc.h" - -+#define rdtsc(low,high) \ -+ __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)) -+ -+ -+ - char *xStrdup (const char *t) {{{ - char *ret; - ret = strdup (t); -@@ -42,18 +47,9 @@ - - void getTimeStampCounter ( TimeStampCounter *t ) {{{ - #ifdef TIMER -- unsigned int h=t->high; -- unsigned int l=t->low ; -- asm ( -- "push %%eax \n" -- "push %%edx \n" -- "rdtsc \n" -- "movl %%eax,%1 \n" -- "movl %%edx,%0 \n" -- "pop %%edx \n" -- "pop %%edx \n" -- : "=m" (h) , "=m" (l) -- ); -+ unsigned long h=t->high; -+ unsigned long l=t->low ; -+ rdtsc(l,h); - t->high = h; - t->low = l; - #else ---- misc.h.orig 2005-10-08 13:52:05.000000000 +0200 -+++ misc.h 2005-10-08 13:52:18.000000000 +0200 -@@ -24,7 +24,7 @@ - - char *xStrdup (const char *t); - --typedef struct { unsigned int high, low; } TimeStampCounter; -+typedef struct { unsigned long high, low; } TimeStampCounter; - void getTimeStampCounter ( TimeStampCounter *t ); - void Start_Timer (unsigned int idx); - void Ende_Timer (unsigned int idx); diff --git a/media-video/SDLcam/files/SDLcam-0.8.0-build.patch b/media-video/SDLcam/files/SDLcam-0.8.0-build.patch deleted file mode 100644 index 2ae4c5b3cd37..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.8.0-build.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -1,16 +1,18 @@ - CC = @CC@ --CPP = @CXX@ --LD = $(CPP) --LDFLAGS = `sdl-config --libs` `xml2-config --libs` -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl -+CXX = @CXX@ -+LD = $(CXX) -+LDFLAGS = @LDFLAGS@ -+LDLIBS = $(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl - PROG = SDLcam - - prefix=@prefix@ - datadir=@datadir@ - --FEATURES = -DMMX -DTIMER -+CPPFLAGS = @CPPFLAGS@ -DMMX -DTIMER -DPROG_VERSION=\"0.7.3\" -DDATADIR="$(datadir)/SDLcam" - --MMXFLAGS = -Wshadow -Wall -Wstrict-prototypes `sdl-config --cflags` `xml2-config --cflags` -DPROG_VERSION=\"0.7.3\" $(FEATURES) --CFLAGS = $(MMXFLAGS) -g -DDATADIR="$(datadir)/SDLcam" -+MMXFLAGS = -Wshadow -Wall $(shell sdl-config --cflags) $(shell xml2-config --cflags) -+CFLAGS = @CFLAGS@ $(MMXFLAGS) -Wstrict-prototypes -+CXXFLAGS = @CXXFLAGS@ $(MMXFLAGS) - - - 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 -@@ -34,32 +36,32 @@ - ./install - - %.o: %.cpp -- $(CC) $(CFLAGS) -c $< -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< - - %.o: %.c -- $(CPP) $(CFLAGS) -c $< -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< - - sources/%.so: sources/%.cpp -- $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? - - sources/jpeg.so: sources/jpeg.cpp -- $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? -ljpeg -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -ljpeg - - filter/%.so: filter/%.c -- $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? - - capture/mpeg.so: capture/mpeg.c -- - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -lfame -+ - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -lfame - - capture/divx.so: capture/divx.c -- - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -ldivxencore -+ - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -ldivxencore - - capture/divx2.so: capture/divx2.cpp -- - $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? -+ - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? - - SDLcam: $(OBJS) -- $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) -+ $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) $(LDLIBS) - # $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) -laviplay - - SDL_v4l_filters_thomas.o: SDL_v4l_filters_thomas.c -- $(CC) $(MMXFLAGS) -c SDL_v4l_filters_thomas.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c SDL_v4l_filters_thomas.c diff --git a/media-video/SDLcam/files/SDLcam-0.8.1-build.patch b/media-video/SDLcam/files/SDLcam-0.8.1-build.patch deleted file mode 100644 index 59dc975f5871..000000000000 --- a/media-video/SDLcam/files/SDLcam-0.8.1-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -pull in png deps - -http://bugs.gentoo.org/194958 - ---- Makefile.in -+++ Makefile.in -@@ -2,7 +2,7 @@ - CXX = @CXX@ - LD = $(CXX) - LDFLAGS = @LDFLAGS@ --LDLIBS = $(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl -+LDLIBS = $(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_image -lSDL_ttf -lm -lxml2 -ljpeg -ldl $(shell libpng-config --libs) - PROG = SDLcam - - prefix=@prefix@ -@@ -10,7 +10,7 @@ - - CPPFLAGS = @CPPFLAGS@ -DMMX -DTIMER -DPROG_VERSION=\"0.8.1\" -DDATADIR="$(datadir)/SDLcam" - --MMXFLAGS = -Wshadow -Wall $(shell sdl-config --cflags) $(shell xml2-config --cflags) -+MMXFLAGS = -Wshadow -Wall $(shell sdl-config --cflags) $(shell xml2-config --cflags) $(shell libpng-config --cflags) - CFLAGS = @CFLAGS@ $(MMXFLAGS) -Wstrict-prototypes - CXXFLAGS = @CXXFLAGS@ $(MMXFLAGS) - |