Version bump and fix libpng linkage #194958 by Leong Seh Hui.

Package-Manager: portage-2.1.3.12

5 files changed, 103 insertions, 8 deletions

diff --git a/media-video/SDLcam/ChangeLog b/media-video/SDLcam/ChangeLog
index cd87536426f0..9b72b615963a 100644
--- a/media-video/SDLcam/ChangeLog
+++ b/media-video/SDLcam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/SDLcam
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.9 2007/10/06 13:05:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.10 2007/10/07 19:50:55 vapier Exp $
+
+*SDLcam-0.8.1 (07 Oct 2007)
+
+  07 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/SDLcam-0.8.1-build.patch, +SDLcam-0.8.1.ebuild:
+  Version bump and fix libpng linkage #194958 by Leong Seh Hui.
 
 *SDLcam-0.8.0 (06 Oct 2007)
 
diff --git a/media-video/SDLcam/Manifest b/media-video/SDLcam/Manifest
index 1e08b8ca2801..37669afb55bf 100644
--- a/media-video/SDLcam/Manifest
+++ b/media-video/SDLcam/Manifest
@@ -33,8 +33,13 @@ AUX SDLcam-0.8.0-build.patch 2557 RMD160 c2cae27b06c9690936cddbb505bb7782c788b3f
 MD5 c1c384d12ae535152276969e7fe05fb7 files/SDLcam-0.8.0-build.patch 2557
 RMD160 c2cae27b06c9690936cddbb505bb7782c788b3f1 files/SDLcam-0.8.0-build.patch 2557
 SHA256 24946a8d22488679c4e627c0b8bda860fcb1ff8555bef0afd8dd8fd4337c9f5d files/SDLcam-0.8.0-build.patch 2557
+AUX SDLcam-0.8.1-build.patch 852 RMD160 d5661caa5d66fb64a87a2353e22dab6ef023e3f1 SHA1 55da5f35764163e769466596a18b5af64b84dadd SHA256 7555e167a8e17af4308d25b73a6afc506efa6dbf0ee7f97b7ba69723f78f9fb9
+MD5 66be794158d1511d00091c1d3b5c369d files/SDLcam-0.8.1-build.patch 852
+RMD160 d5661caa5d66fb64a87a2353e22dab6ef023e3f1 files/SDLcam-0.8.1-build.patch 852
+SHA256 7555e167a8e17af4308d25b73a6afc506efa6dbf0ee7f97b7ba69723f78f9fb9 files/SDLcam-0.8.1-build.patch 852
 DIST SDLcam-0.7.3.tar.gz 299421 RMD160 bb59dadae8a2ac4f5f86b16abb298a498e25a5eb SHA1 d6c3945f51bb1c5a6701652a06fe752f273b2ef9 SHA256 227e44ab23fd3081e170a61fac81f8920cf8f4c34d92ea57ce61fd056674c6a4
 DIST sdlcam-0.8.0.tar.gz 347284 RMD160 550a7170bba30fab1266610ba828b76a12ccdfcb SHA1 6bebd1e33ba3d9326056a0287f45d8e7122d8ed1 SHA256 7d227c042bf91b026ed0a585c378d34a2d50ad50061107f77adc8f367e21455a
+DIST sdlcam-0.8.1.tar.gz 336390 RMD160 fb2498e483836f90e776bce473fef8f5335a0726 SHA1 981bf2ee12fe3099d59b9337c137ae9460363574 SHA256 96e518d7b9cd8314a4fa95233614a1a323767c227f324619cdf9217ad4e6f9ff
 EBUILD SDLcam-0.7.3-r2.ebuild 1588 RMD160 b7d3cb4cf7c36c22637b026015a59b22d36e8eb1 SHA1 7ae5b5194274aa69c03455ce32c991b36b67bfb9 SHA256 0886d67a3b0c475d440f95576f3d0ba9d51d3ef98d34f742c21c33ecac95e164
 MD5 a8c73d66427e5a78c9bf15028eeec17a SDLcam-0.7.3-r2.ebuild 1588
 RMD160 b7d3cb4cf7c36c22637b026015a59b22d36e8eb1 SDLcam-0.7.3-r2.ebuild 1588
@@ -43,10 +48,14 @@ EBUILD SDLcam-0.8.0.ebuild 1632 RMD160 debbaab008198d19fec48b61ab846aec5961272e
 MD5 d426ccc5b8290a19ac1eb6e65a7cc769 SDLcam-0.8.0.ebuild 1632
 RMD160 debbaab008198d19fec48b61ab846aec5961272e SDLcam-0.8.0.ebuild 1632
 SHA256 bb53e2e57f81af8703bb4e707e9833979f7c95e5ec6eb83f04d4943a565f2e64 SDLcam-0.8.0.ebuild 1632
-MISC ChangeLog 1729 RMD160 8b91e3c055c4500f3e42c87d854a044b5c1c89a8 SHA1 02a6c12368f855a32bac3038cb0372772f119d6d SHA256 95663e0b7b220aca5f0e6908a78093e7fd61310f6787051017d0d10beed1727b
-MD5 3e9980723e8f27e08ac39ff5c102b421 ChangeLog 1729
-RMD160 8b91e3c055c4500f3e42c87d854a044b5c1c89a8 ChangeLog 1729
-SHA256 95663e0b7b220aca5f0e6908a78093e7fd61310f6787051017d0d10beed1727b ChangeLog 1729
+EBUILD SDLcam-0.8.1.ebuild 1430 RMD160 edfc77cce4439f6208d0561f9622301083c50327 SHA1 6b11a26290376447a86129427a59b08157fa1909 SHA256 ba6369bec09925790a0c7d62216c311bafde13bea842b15c92302d003a515f15
+MD5 1c172bc19d4e6c2d92e22b18dded495d SDLcam-0.8.1.ebuild 1430
+RMD160 edfc77cce4439f6208d0561f9622301083c50327 SDLcam-0.8.1.ebuild 1430
+SHA256 ba6369bec09925790a0c7d62216c311bafde13bea842b15c92302d003a515f15 SDLcam-0.8.1.ebuild 1430
+MISC ChangeLog 1931 RMD160 8d98a62e93e7777594ec17e0173b14a0f6daa2a4 SHA1 063c5e9d743534dc1e7a461071dd605257b934ff SHA256 9c737383b16896cd84a93fd8f760cefd200ff17d801b044e4f5836a28526f1be
+MD5 39b58b37891855ffab2c0029bba4f424 ChangeLog 1931
+RMD160 8d98a62e93e7777594ec17e0173b14a0f6daa2a4 ChangeLog 1931
+SHA256 9c737383b16896cd84a93fd8f760cefd200ff17d801b044e4f5836a28526f1be ChangeLog 1931
 MISC metadata.xml 579 RMD160 6e275c3fac48efbd4b422f2d3ea85500e20c9157 SHA1 09a520db73ada60d7f641107e2d6701b4e09ecd3 SHA256 3107244e2ed520c02b9958babf40e125e379af93997c10c812f1037a2feb6f67
 MD5 9c86830b089cab3e08a1f927b14d78b9 metadata.xml 579
 RMD160 6e275c3fac48efbd4b422f2d3ea85500e20c9157 metadata.xml 579
@@ -57,10 +66,13 @@ SHA256 a56fff67a8837d64c109b33ad4cf37d36dcf0647dfddb2ccdfbfe5816ff51c6b files/di
 MD5 e5f6b552c5bc7bc58e7ff1f285968010 files/digest-SDLcam-0.8.0 238
 RMD160 a44cc157129754aa840fbc68cf04d2dade664b4a files/digest-SDLcam-0.8.0 238
 SHA256 61fc40ac69bb7f2145cd674489a17f32f72bfc128667c58e8712fce5f5991f02 files/digest-SDLcam-0.8.0 238
+MD5 2e8c83562819fb93eb8c6f8c130db08d files/digest-SDLcam-0.8.1 238
+RMD160 2a0cf5fdbea18156540cf719a4f072611e2dc6d8 files/digest-SDLcam-0.8.1 238
+SHA256 ce2dc238ee2c727a33e41a1e33ddbb4aa9509bafa655c7406ac0ffab03b71944 files/digest-SDLcam-0.8.1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHB4iNp/wUKkr7RBoRAuMVAJ4sPksK7KpOybM2afSnnF+Z5rAEawCgx1Hb
-dLsm8QzPyurZtco+au6/xf8=
-=ggIj
+iD8DBQFHCTilp/wUKkr7RBoRAlwlAJ9tPGZ7doD7HLbBJXMJY2hhkYfZ+wCgs/O0
+iQlbf8zOpXpO5FkCio+SHqc=
+=A4XW
 -----END PGP SIGNATURE-----
diff --git a/media-video/SDLcam/SDLcam-0.8.1.ebuild b/media-video/SDLcam/SDLcam-0.8.1.ebuild
new file mode 100644
index 000000000000..2d016bb965b2
--- /dev/null
+++ b/media-video/SDLcam/SDLcam-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.8.1.ebuild,v 1.1 2007/10/07 19:50:55 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="webcam application that uses the SDL library"
+HOMEPAGE="http://sdlcam.raphnet.net/"
+SRC_URI="http://sdlcam.raphnet.net/downloads/sdlcam-${PV}.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"
+
+S=${WORKDIR}/sdlcam-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.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/$(get_libdir)/SDLcam:' \
+		-e 's:sources/:/usr/$(get_libdir)/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
+	exeinto /usr/$(get_libdir)/SDLcam/filters
+	doexe filter/*.so || die
+	exeinto /usr/$(get_libdir)/SDLcam/capture
+	doexe capture/*.so || die
+	exeinto /usr/$(get_libdir)/SDLcam/sources
+	doexe sources/*.so || die
+	dodoc CHANGELOG README TODO Documentation/config_file.txt Documentation/gui.txt
+}
diff --git a/media-video/SDLcam/files/SDLcam-0.8.1-build.patch b/media-video/SDLcam/files/SDLcam-0.8.1-build.patch
new file mode 100644
index 000000000000..59dc975f5871
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.8.1-build.patch
@@ -0,0 +1,24 @@
+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)
+ 
diff --git a/media-video/SDLcam/files/digest-SDLcam-0.8.1 b/media-video/SDLcam/files/digest-SDLcam-0.8.1
new file mode 100644
index 000000000000..88595d4055d5
--- /dev/null
+++ b/media-video/SDLcam/files/digest-SDLcam-0.8.1
@@ -0,0 +1,3 @@
+MD5 4ee326755ac7cff4f507784baac338eb sdlcam-0.8.1.tar.gz 336390
+RMD160 fb2498e483836f90e776bce473fef8f5335a0726 sdlcam-0.8.1.tar.gz 336390
+SHA256 96e518d7b9cd8314a4fa95233614a1a323767c227f324619cdf9217ad4e6f9ff sdlcam-0.8.1.tar.gz 336390