summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/SDLcam/ChangeLog9
-rw-r--r--media-video/SDLcam/SDLcam-0.7.3-r1.ebuild (renamed from media-video/SDLcam/SDLcam-0.7.3.ebuild)23
-rw-r--r--media-video/SDLcam/files/0.7.3-linux-2.6.patch20
-rw-r--r--media-video/SDLcam/files/0.7.3-no-divx.patch12
-rw-r--r--media-video/SDLcam/files/digest-SDLcam-0.7.3-r1 (renamed from media-video/SDLcam/files/digest-SDLcam-0.7.3)0
-rw-r--r--media-video/SDLcam/metadata.xml15
6 files changed, 72 insertions, 7 deletions
diff --git a/media-video/SDLcam/ChangeLog b/media-video/SDLcam/ChangeLog
index a7f2b5ab65e4..569815173047 100644
--- a/media-video/SDLcam/ChangeLog
+++ b/media-video/SDLcam/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-video/SDLcam
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.3 2003/09/10 04:37:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.4 2004/01/30 09:40:13 vapier Exp $
+
+*SDLcam-0.7.3-r1 (30 Jan 2004)
+
+ 30 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+ Disable divx.so because it needs to be ported to newer avifile.
+ Fix installing of source modules #39782. Also change the default
+ cflags of -g to the ones the user has.
*SDLcam-0.7.3 (30 Sep 2002)
diff --git a/media-video/SDLcam/SDLcam-0.7.3.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild
index cf9e01bf798d..8796816d7400 100644
--- a/media-video/SDLcam/SDLcam-0.7.3.ebuild
+++ b/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3.ebuild,v 1.6 2003/09/10 04:37:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild,v 1.1 2004/01/30 09:40:13 vapier Exp $
+
+inherit eutils
DESCRIPTION="Webcam application that uses the SDL library"
HOMEPAGE="http://raph.darktech.org/SDLcam/"
@@ -19,11 +21,18 @@ 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
+ sed -i "s: -g: ${CFLAGS} `avifile-config --cflags`:" Makefile
+ sed -i "/#include/s:avifile/::" capture/divx2.cpp
+
# 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:" \
- configuration.h interface.cpp SDL_v4l_filters.c
+ -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_compile() {
@@ -35,7 +44,9 @@ src_install () {
insinto /usr/share/SDLcam
doins LucidaSansRegular.ttf LucidaTypewriterRegular.ttf SDLcam.xml SDLcam.cfg
insinto /usr/lib/SDLcam/filters
- doins ${S}/filter/*.so
+ doins filter/*.so
insinto /usr/lib/SDLcam/capture
- doins ${S}/capture/*.so
+ doins capture/*.so
+ insinto /usr/lib/SDLcam/sources
+ doins sources/*.so
}
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
new file mode 100644
index 000000000000..cd3c88e5c4f3
--- /dev/null
+++ b/media-video/SDLcam/files/0.7.3-linux-2.6.patch
@@ -0,0 +1,20 @@
+--- 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/0.7.3-no-divx.patch b/media-video/SDLcam/files/0.7.3-no-divx.patch
new file mode 100644
index 000000000000..c1a2b66e7190
--- /dev/null
+++ b/media-video/SDLcam/files/0.7.3-no-divx.patch
@@ -0,0 +1,12 @@
+--- Makefile.orig 2004-01-30 04:29:32.359312208 -0500
++++ Makefile 2004-01-30 04:29:38.376397472 -0500
+@@ -48,9 +48,6 @@
+ capture/mpeg.so: capture/mpeg.c
+ - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -lfame
+
+-capture/divx.so: capture/divx.c
+- - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -ldivxencore
+-
+ capture/divx2.so: capture/divx2.cpp
+ - $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $?
+
diff --git a/media-video/SDLcam/files/digest-SDLcam-0.7.3 b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1
index a9c2256dddd8..a9c2256dddd8 100644
--- a/media-video/SDLcam/files/digest-SDLcam-0.7.3
+++ b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r1
diff --git a/media-video/SDLcam/metadata.xml b/media-video/SDLcam/metadata.xml
new file mode 100644
index 000000000000..a00ef3ce00cd
--- /dev/null
+++ b/media-video/SDLcam/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<longdescription>
+SDLcam is a simple Video4Linux program, that was designed to view video streams coming from a Philips USB
+Webcam.
+
+It uses SDL, and has a simple user interface. SDLcam can save snapshots in Jpeg, PNG or BMP formats. It
+also has a lot of video filters that can be combined and applied in real time to the video stream.
+</longdescription>
+</pkgmetadata>