From 0e6a8a6c51115943235f06224d9fd14b0eb41df3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 17 Sep 2022 11:17:07 +0100
Subject: gentoo auto-resync : 17:09:2022 - 11:17:07

---
 media-video/droidcam/Manifest                      |   4 +-
 media-video/droidcam/droidcam-1.8.2-r1.ebuild      | 155 +++++++++++++++++++++
 media-video/droidcam/droidcam-1.8.2.ebuild         | 155 ---------------------
 .../files/droidcam-1.8.2-makefile-fixes.patch      |  61 ++++++++
 .../droidcam/files/droidcam-makefile-fixes.patch   |  62 ---------
 5 files changed, 218 insertions(+), 219 deletions(-)
 create mode 100644 media-video/droidcam/droidcam-1.8.2-r1.ebuild
 delete mode 100644 media-video/droidcam/droidcam-1.8.2.ebuild
 create mode 100644 media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch
 delete mode 100644 media-video/droidcam/files/droidcam-makefile-fixes.patch

(limited to 'media-video/droidcam')

diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index af38b128f0e1..cf652118646e 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,4 +1,4 @@
-AUX droidcam-makefile-fixes.patch 2178 BLAKE2B 223344a2138b0a93f7eaffda4814236acf19a7cf6d4ee6daa03be3b7c601b549ce77219d03f53dbb1ac11493ff991c08f8d035fb91dbed22b590c07628318640 SHA512 73082410683b81794589816a3158ea66ce1c6717f65454f4528e1b00298c88131fec3f460915cfb603ccb85be1b54134869444924bf63c69cee89f03a275b556
+AUX droidcam-1.8.2-makefile-fixes.patch 2156 BLAKE2B 285f07e3fcf679878b0eec87d04dd411c4c15af90bf9d0e1509d330159c057d224125cda98bdaaaf65b4d8b420d9501b10185a8ff8a7a4dfb93cf002e2e882fe SHA512 02c97d9a22209218f8b8b3a245bf83ea095a9f3b6999b3bd11aa43374ef65eb87d361b7d34a9cfd1fcb879c1136f2f356cd4511f3c05188bea523edacf606fbe
 DIST droidcam-1.8.2.tar.gz 84797 BLAKE2B b2458dd04b467106a6d9a8a9f3d44058641a7c8ca429d5c92f498401c07f6bc364dc056755f21b40faac7e7aec1877250afb119ac3b7f979b24cdeb86f45c384 SHA512 507f513c8d0dffa86afe5368ccab5461931e236b6352269a6eb5e970a79e5f9b386808da3466f3b391e955170b47b24a82663632ddc3c3c84e4de5988b7d3f8f
-EBUILD droidcam-1.8.2.ebuild 3454 BLAKE2B 7c61b43a0aa8f36bd052325f2b5f0b7bc845a2b761b6a91e109a15bd5ddd490dbe9ca498441b15f0924ab18433309139c3bb798b886254d7c5f4dcd19366b215 SHA512 e04361ee773793c5291faa8f608697aa8b0a90c7350d535dc4d43ca05c518c6f0a9b212a0a49f40fa0742b0b674374938309fe6ab017733ab65a97905deab100
+EBUILD droidcam-1.8.2-r1.ebuild 3460 BLAKE2B 90b337253fb83989eb5824bd7556c9b64c8df235be51d8576c914576d601f50d398307afd73fd474b1ffdccb8cf7cf50c300c6a1fc5e0b85780dabe8a0338d4e SHA512 82b6c5aa23db6cad507d515251c85d011b3272a98169cf293b142c7a139d4f18fe626d703b0c355fb245e04430c08dc1dc83a0d214f1051ec42dda5ba983b201
 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.8.2-r1.ebuild b/media-video/droidcam/droidcam-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..53150f3a9c28
--- /dev/null
+++ b/media-video/droidcam/droidcam-1.8.2-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop linux-mod xdg
+
+DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
+SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk"
+
+# Requires connection to phone/tablet
+RESTRICT="test"
+
+DEPEND="
+	app-pda/libplist
+	app-pda/libusbmuxd
+	dev-libs/glib
+	dev-libs/libappindicator:3
+	dev-libs/libxml2
+	dev-util/android-tools
+	media-libs/alsa-lib
+	media-libs/libjpeg-turbo
+	>=media-libs/speex-1.2.0-r1
+	media-video/ffmpeg
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
+MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
+
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
+
+PATCHES="${FILESDIR}/${PN}-1.8.2-makefile-fixes.patch"
+
+src_prepare() {
+	if ! use gtk; then
+		default
+		sed -i -e '/cflags gtk+/d' Makefile || die
+	else
+		xdg_src_prepare
+		# remove path and extension from Icon and Exec entry
+		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
+			-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
+			droidcam.desktop || die
+		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	if use gtk; then
+		emake droidcam
+	fi
+	emake droidcam-cli
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+	export KERNEL_DIR || die
+	linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback" || die
+	default
+	./test || die
+	popd || die
+}
+
+src_install() {
+	if use gtk; then
+		dobin droidcam
+		newicon -s 32 icon.png droidcam.png
+		newicon -s 96 icon2.png droidcam.png
+		domenu droidcam.desktop
+	fi
+	dobin droidcam-cli
+
+	# The cli and gui do not auto load the module if unloaded (why not though?)
+	# so we just put it in modules-load.d to make sure it always works
+	insinto /etc/modules-load.d
+	if linux_config_exists; then
+		if linux_chkconfig_module SND_ALOOP; then
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+				snd_aloop
+			EOF
+		else
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+			EOF
+		fi
+	fi
+
+	einstalldocs
+	linux-mod_src_install
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+	if use gtk; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if use gtk; then
+		xdg_pkg_postinst
+	else
+		elog
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
+		elog
+	fi
+
+	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
+	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
+	elog
+	elog "Links to the Android/iPhone/iPad apps can be found at"
+	elog "https://www.dev47apps.com/"
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	if use gtk; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/media-video/droidcam/droidcam-1.8.2.ebuild b/media-video/droidcam/droidcam-1.8.2.ebuild
deleted file mode 100644
index 5f32002d8d66..000000000000
--- a/media-video/droidcam/droidcam-1.8.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop linux-mod xdg
-
-DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
-HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
-SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk"
-
-# Requires connection to phone/tablet
-RESTRICT="test"
-
-DEPEND="
-	app-pda/libplist
-	app-pda/libusbmuxd
-	dev-libs/glib
-	dev-libs/libappindicator:3
-	dev-libs/libxml2
-	dev-util/android-tools
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo
-	>=media-libs/speex-1.2.0-r1
-	media-video/ffmpeg
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
-
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
-
-src_prepare() {
-	if ! use gtk; then
-		default
-		sed -i -e '/cflags gtk+/d' Makefile || die
-	else
-		xdg_src_prepare
-		# remove path and extension from Icon and Exec entry
-		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
-			-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
-			droidcam.desktop || die
-		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-	default
-}
-
-src_compile() {
-	if use gtk; then
-		emake droidcam
-	fi
-	emake droidcam-cli
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-	export KERNEL_DIR || die
-	linux-mod_src_compile
-}
-
-src_test() {
-	pushd "v4l2loopback" || die
-	default
-	./test || die
-	popd || die
-}
-
-src_install() {
-	if use gtk; then
-		dobin droidcam
-		newicon -s 32 icon.png droidcam.png
-		newicon -s 96 icon2.png droidcam.png
-		domenu droidcam.desktop
-	fi
-	dobin droidcam-cli
-
-	# The cli and gui do not auto load the module if unloaded (why not though?)
-	# so we just put it in modules-load.d to make sure it always works
-	insinto /etc/modules-load.d
-	if linux_config_exists; then
-		if linux_chkconfig_module SND_ALOOP; then
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-				snd_aloop
-			EOF
-		else
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-			EOF
-		fi
-	fi
-
-	einstalldocs
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-	if use gtk; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if use gtk; then
-		xdg_pkg_postinst
-	else
-		elog
-		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
-		elog
-	fi
-
-	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
-	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
-	elog
-	elog "Links to the Android/iPhone/iPad apps can be found at"
-	elog "https://www.dev47apps.com/"
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	if use gtk; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch
new file mode 100644
index 000000000000..56b7589b2d12
--- /dev/null
+++ b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch
@@ -0,0 +1,61 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..85ef623 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,25 +6,19 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+ 
+-JPEG_DIR ?= /opt/libjpeg-turbo
+-JPEG_INCLUDE ?= $(JPEG_DIR)/include
+-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+-
+-CC   = gcc
+-CFLAGS = -Wall -O2
+ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+ GTK  += `pkg-config --cflags --libs appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS  =  -lspeex -lasound -lpthread -lm
+-JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
++JPEG  = `pkg-config --libs --cflags libturbojpeg`
+ SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
+-USBMUXD = -lusbmuxd
++USBMUXD = -lusbmuxd-2.0
+ 
+ all: droidcam-cli droidcam
+ 
+ ifneq "$(RELEASE)" ""
+-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
+-SRC  += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
++LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so
++SRC  += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so
+ package: clean all
+ 	zip "droidcam_$(RELEASE).zip" \
+ 		LICENSE README* icon2.png  \
+@@ -40,11 +34,11 @@ gresource: .gresource.xml icon2.png
+ 
+ droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
+ droidcam-cli: src/droidcam-cli.c $(SRC)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ 
+ droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
+ droidcam: src/droidcam.c src/resources.c $(SRC)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ 
+ clean:
+ 	rm -f droidcam
+diff --git a/v4l2loopback/Makefile b/v4l2loopback/Makefile
+index 28c4502..02356e9 100644
+--- a/v4l2loopback/Makefile
++++ b/v4l2loopback/Makefile
+@@ -11,7 +11,7 @@ install:
+ 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
+ 
+ test:
+-	gcc test.c -o test
++	$(CC) test.c -o test
+ 
+ clean:
+ 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
deleted file mode 100644
index 9c6ad4c45c09..000000000000
--- a/media-video/droidcam/files/droidcam-makefile-fixes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7be3c15..8af0953 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,25 +6,23 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- # Use at your own risk. See README file for more details.
- 
--JPEG_DIR ?= /opt/libjpeg-turbo
-+JPEG_DIR ?= /usr
- JPEG_INCLUDE ?= $(JPEG_DIR)/include
- JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
- 
--CC   = gcc
--CFLAGS = -Wall -O2
- GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
- GTK  += `pkg-config --cflags --libs appindicator3-0.1`
- LIBAV = `pkg-config --libs --cflags libswscale libavutil`
- LIBS  =  -lspeex -lasound -lpthread -lm
--JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
-+JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
- SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
--USBMUXD = -lusbmuxd
-+USBMUXD = -lusbmuxd-2.0
- 
- all: droidcam-cli droidcam
- 
- ifneq "$(RELEASE)" ""
--LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
--SRC  += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
-+LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so
-+SRC  += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so
- package: clean all
- 	zip "droidcam_$(RELEASE).zip" \
- 		LICENSE README* icon2.png  \
-@@ -40,11 +38,11 @@ gresource: .gresource.xml icon2.png
- 
- droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
- droidcam-cli: src/droidcam-cli.c $(SRC)
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
-+	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
- 
- droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
- droidcam: src/droidcam.c src/resources.c $(SRC)
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
-+	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
- 
- clean:
- 	rm -f droidcam
-diff --git a/v4l2loopback/Makefile b/v4l2loopback/Makefile
-index 28c4502..02356e9 100644
---- a/v4l2loopback/Makefile
-+++ b/v4l2loopback/Makefile
-@@ -11,7 +11,7 @@ install:
- 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
- 
- test:
--	gcc test.c -o test
-+	$(CC) test.c -o test
- 
- clean:
- 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean
-- 
cgit v1.2.3