[media-video/webcamstudio] Allow newer kernel module and do library compilation here.

4 files changed, 72 insertions, 48 deletions

diff --git a/media-video/webcamstudio/ChangeLog b/media-video/webcamstudio/ChangeLog
index cf689d8..b9611a6 100644
--- a/media-video/webcamstudio/ChangeLog
+++ b/media-video/webcamstudio/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-video/webcamstudio
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*webcamstudio-0.57_beta4-r1 (01 Apr 2013)
+
+  01 Apr 2013; Dustin Polke <DuPol@gmx.de> -webcamstudio-0.57_beta4.ebuild,
+  +webcamstudio-0.57_beta4-r1.ebuild:
+  Rev bump to allow newer kernel module and compile library here.
+
   09 Feb 2012; Dustin Polke <DuPol@gmx.de> webcamstudio-0.57_beta4.ebuild:
   Make use of unpacker eclass.
 
diff --git a/media-video/webcamstudio/Manifest b/media-video/webcamstudio/Manifest
index a97ba3a..dfd3036 100644
--- a/media-video/webcamstudio/Manifest
+++ b/media-video/webcamstudio/Manifest
@@ -1,5 +1,5 @@
-AUX webcamstudio-gentooify.patch 904 RMD160 85764728ce44fa2f29d569cf0a8134eeb7c2fedc SHA1 91931409f51d1719791a80f6dd03969ada075cef SHA256 91c2c45ae2356ba58c3c94653746d86e54d4117b5bcfba03c5013d2a8fcbd695
-DIST webcamstudio_0.57beta4_all.deb 15264140 RMD160 1b54dacf70a7ff56424f64d1dd4b2a0aaffd30d4 SHA1 afe07482b938449ef94321689abc4ffc5cec04a2 SHA256 4b9399269e73402a166762f995d1bd5e3247c6fe8b72ee2bbcbebd9dd3366efd
-EBUILD webcamstudio-0.57_beta4.ebuild 1004 RMD160 23facc976be49a8414f46c85886cc498f590aa73 SHA1 d164d6a36a50b1b411fa1775d5cb1dcd730c7ccb SHA256 7c101df6ddac6d4a133577ed1f6208cdc624c5f02bd3d28aefdb9dfe48046d09
-MISC ChangeLog 443 RMD160 718932dd7194fa8ea5792787a0d844998c5b0446 SHA1 6f4fcdb07920ec85d9fc77507d3acfd1bed93e92 SHA256 5593a098075b0558775fa8571b823e46122411e9800d8033c9b48ef880a253d3
-MISC metadata.xml 202 RMD160 f5c140462716f7b267daa9352b2f1908fbbe3e00 SHA1 df31e266563fa79bf52a780e1fbbe922614c7e3c SHA256 898b32b6414d22f4ea6738700b5787496b6e6ba12abe71cc823e8815e58a563f
+AUX webcamstudio-gentooify.patch 904 SHA256 91c2c45ae2356ba58c3c94653746d86e54d4117b5bcfba03c5013d2a8fcbd695 SHA512 31e04e276e76be3dd606b9079d97100a1ede27410e007c515f5c5b549b7f2399fc19f3baddb2d526188bfdccf4b1415bc7a2854164f7858fe105fa20b9349238 WHIRLPOOL 538895b69cc8bb9719ea81ad8a76118a2e4c832b7d0b9d346fd98eee392bd286969cf6ac5e24213ac2ec5c69ceac67d6a4515845573127944b76c96f59ba85ab
+DIST webcamstudio_0.57beta4_all.deb 15264140 SHA256 4b9399269e73402a166762f995d1bd5e3247c6fe8b72ee2bbcbebd9dd3366efd SHA512 1bca5a093c6e7e0dcace96c7696a4fa1596f0f72334e091401cfd5280c6c220ab7c1e60b3d4cbe461bcc7610b68f6a1c5589425ad5615bd6a9f9130ace09ec06 WHIRLPOOL ff3491c4642ea2127392190c93161627c1e55b66796ba41359915d898bbcf6c702800d951404408ec0bd6af4c47e882d4134c76d3f3d90bc129b308ee31bb88b
+EBUILD webcamstudio-0.57_beta4-r1.ebuild 1770 SHA256 5ebf48d207ab20ed1f7cbbcc86b6f1925bd698621e9c63d8ff7ed35f09397cc2 SHA512 ef9d3771e31ed2aea5d6d65f85423d0676c1ecacc6c0128fca36f62417fd0d645e359f9655253bed497bb16da2d750ebd47d2582e4c10d6c88bf38bd3e985064 WHIRLPOOL 14267b67e792be24b36d09d0aa79b0c079b21a2aa55e5e23d7cce8379626dbf56b9f1da3a036b6297fa10fb664c99bb5c7cfa3732ea7e8ac970aa71399b3d7b6
+MISC ChangeLog 667 SHA256 f32a3d389615eb2bd64e795660d17932f56e72b9f19e68edd04e6301271c52fd SHA512 a553a90c1143bd7c74a51c9db45c58f5ddb1be73adb8b4725cc55f7232adffcf1bdd47a752781ca24b2a172494903234dfe7eeee913d16501954059b855a0e98 WHIRLPOOL 7cf158819b2929b47d5e51ae79ba2b83af7dcedeb760d08eac18a6d2af6f633eabefc1a77f13ef501d0d16a8de7836526a7cac88fc6e39938a5e45cebae07f2c
+MISC metadata.xml 202 SHA256 898b32b6414d22f4ea6738700b5787496b6e6ba12abe71cc823e8815e58a563f SHA512 6c849882d504372e8d4a9a958d03b1a93f5f886c8b45f3e2b7688c2fe1e8ec76f3d26a73cb4b8a57aa120ee2e5d3b0185a59d01bf16eed60f30bd2d4603f50ee WHIRLPOOL 2b59a7764d05e8fbe255cd1e290f2e46d96898f397c1c8832b4efa41141dff9be823cec86253fc0f16d8c710fd5f8b880cfbc71c27abaec4265dfc51d64a67fd
diff --git a/media-video/webcamstudio/webcamstudio-0.57_beta4-r1.ebuild b/media-video/webcamstudio/webcamstudio-0.57_beta4-r1.ebuild
new file mode 100644
index 0000000..e9fe0fe
--- /dev/null
+++ b/media-video/webcamstudio/webcamstudio-0.57_beta4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit versionator unpacker eutils
+
+MY_P="${PN}_$(delete_version_separator 2)"
+
+DESCRIPTION="Virtual webcam that can mix several video sources together"
+HOMEPAGE="http://www.ws4gl.org/"
+SRC_URI="http://webcamstudio.googlecode.com/files/${MY_P}_all.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pulseaudio"
+
+DEPEND="!=media-video/webcamstudio-module-0.75_beta4"
+RDEPEND="dev-java/jna
+	media-video/${PN}-module
+	virtual/jre
+	pulseaudio? ( media-sound/pulseaudio )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gentooify.patch"
+
+	rm ./usr/bin/webcamstudioConsole || die
+	if ! use pulseaudio; then
+		rm ./usr/bin/ws4gl-pulseaudio-get{apps,sources}.sh || die
+	fi
+}
+
+src_compile() {
+	pushd  usr/share/${PN}/${PN}-src >/dev/null || die
+	echo "$(tc-getCC) -c -fPIC ${CFLAGS} -o libwebcamstudio.o libwebcamstudio.c"
+	$(tc-getCC) -c -fPIC ${CFLAGS} -o libwebcamstudio.o libwebcamstudio.c || die
+	echo "$(tc-getCC) -shared -Wl,-soname,libwebcamstudio.so.1 ${LDFLAGS} \
+		-o libwebcamstudio.so.1.0.1 libwebcamstudio.o"
+	$(tc-getCC) -shared -Wl,-soname,libwebcamstudio.so.1 ${LDFLAGS} \
+		-o libwebcamstudio.so.1.0.1 libwebcamstudio.o || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+	pushd  usr/share/${PN}/${PN}-src >/dev/null || die
+	doins libwebcamstudio.so.1.0.1
+	dosym libwebcamstudio.so.1.0.1 usr/$(get_libdir)/libwebcamstudio.so
+	dosym libwebcamstudio.so.1.0.1 usr/$(get_libdir)/libwebcamstudio.so.1
+	popd >/dev/null || die
+
+	rm -rf ./usr/share/${PN}/${PN}-src || die
+
+	cp -R "${S}/usr" "${D}/" || die "Install failed!"
+	dosym /usr/share/jna/lib/jna.jar /usr/lib/webcamstudio/lib/jna.jar
+}
diff --git a/media-video/webcamstudio/webcamstudio-0.57_beta4.ebuild b/media-video/webcamstudio/webcamstudio-0.57_beta4.ebuild
deleted file mode 100644
index b935d62..0000000
--- a/media-video/webcamstudio/webcamstudio-0.57_beta4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit versionator unpacker eutils
-
-MY_P="${PN}_$(delete_version_separator 2)"
-
-DESCRIPTION="Virtual webcam that can mix several video sources together"
-HOMEPAGE="http://www.ws4gl.org/"
-SRC_URI="http://webcamstudio.googlecode.com/files/${MY_P}_all.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pulseaudio"
-
-DEPEND=""
-RDEPEND="dev-java/jna
-	~media-video/${PN}-module-${PV}
-	virtual/jre
-	pulseaudio? ( media-sound/pulseaudio )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentooify.patch"
-
-	rm -rf ./usr/share/${PN}/${PN}-src || die # handled in webcamstudio-module
-	rm ./usr/bin/webcamstudioConsole || die
-	if ! use pulseaudio; then
-		rm ./usr/bin/ws4gl-pulseaudio-get{apps,sources}.sh || die
-	fi
-}
-
-src_install() {
-	dodir usr
-	cp -R "${S}/usr" "${D}/" || die "Install failed!"
-	dosym /usr/share/jna/lib/jna.jar /usr/lib/webcamstudio/lib/jna.jar
-}