gentoo resync : 22.12.2021

4 files changed, 24 insertions, 154 deletions

diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 58c71a968ec2..8a5d8ab5c764 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,5 +1,4 @@
-AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8
-DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
-EBUILD droidcam-1.8.0-r1.ebuild 3474 BLAKE2B 9cfbca9e3254ddece5369b932294497c1f27bb8e73904d663eb7e727a82cce1a132221a59cd0de8afb8d12ed1cadcd19c4bd19328c9ef104f7d72c5f82579b43 SHA512 c849bb9cbbc84d987da9bf54a7972016142d562dceb8ae4ce81fd04b3a3c6d2da6073f38dabb240eb429244098d48ced1ecbd0254642e4c2573389f55a3d514c
-EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221
+AUX droidcam-makefile-fixes.patch 2178 BLAKE2B 223344a2138b0a93f7eaffda4814236acf19a7cf6d4ee6daa03be3b7c601b549ce77219d03f53dbb1ac11493ff991c08f8d035fb91dbed22b590c07628318640 SHA512 73082410683b81794589816a3158ea66ce1c6717f65454f4528e1b00298c88131fec3f460915cfb603ccb85be1b54134869444924bf63c69cee89f03a275b556
+DIST droidcam-1.8.1.tar.gz 84566 BLAKE2B ba023c98159003bef39eac2fcff211243aa5fb2cc4369a333c5b78c9708b8c34ff9987d6b84628b32e436bab776e0c8c83f75b7c6a788f85831d3d17dd468833 SHA512 58ce6014004edcbf89b4847ed916f9cd2757865172c61e446a04b2f6d93395db1013f0cb31f0b10161bfd83a1436e684891c3457371a3ad62308509bb85b4cf4
+EBUILD droidcam-1.8.1-r1.ebuild 3474 BLAKE2B 97f8aae82515038bcab4e4a24dd2e1c5e900fadb55368781e91622ff4d08b6d98057c37527e9bea79a95365cb8c3b0cef9a22ade480e7ca11dd2de8d172c9830 SHA512 2007f83f3ee34188b208fc5baceecef410c88f38ed596fd1dadd6c35857753bbe9df2eed37525affeee7ac2f1f16783fb0a6935805f91321801ec93d7bad7c44
 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.8.0.ebuild b/media-video/droidcam/droidcam-1.8.0.ebuild
deleted file mode 100644
index 60f47eb1847b..000000000000
--- a/media-video/droidcam/droidcam-1.8.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2019-2021 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? (
-		dev-cpp/gtkmm:3.0
-		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
-		sed -i -e '/cflags gtk+/d' Makefile || die
-		default
-	else
-		# 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
-		xdg_src_prepare
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-	default
-}
-
-src_compile() {
-	if use gtk; then
-		emake droidcam
-	fi
-	emake droidcam-cli
-	KERNELRELEASE="${KV_FULL}" 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() {
-	if use gtk; then
-		xdg_pkg_preinst
-	fi
-	linux-mod_pkg_preinst
-}
-
-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() {
-	if use gtk; then
-		xdg_pkg_postrm
-	fi
-	linux-mod_pkg_postrm
-}
diff --git a/media-video/droidcam/droidcam-1.8.0-r1.ebuild b/media-video/droidcam/droidcam-1.8.1-r1.ebuild
index d81482560789..ffafcc099bd0 100644
--- a/media-video/droidcam/droidcam-1.8.0-r1.ebuild
+++ b/media-video/droidcam/droidcam-1.8.1-r1.ebuild
@@ -51,15 +51,15 @@ PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
 
 src_prepare() {
 	if ! use gtk; then
-		sed -i -e '/cflags gtk+/d' Makefile || die
 		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
-		xdg_src_prepare
 	fi
 }
 
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
index 5230c18f0f33..9c6ad4c45c09 100644
--- a/media-video/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 7be3c15..099a707 100644
+index 7be3c15..8af0953 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,25 +6,23 @@
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  # Use at your own risk. See README file for more details.
  
@@ -11,7 +11,9 @@ index 7be3c15..099a707 100644
  JPEG_INCLUDE ?= $(JPEG_DIR)/include
  JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
  
-@@ -16,15 +16,15 @@ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-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
@@ -31,7 +33,7 @@ index 7be3c15..099a707 100644
  package: clean all
  	zip "droidcam_$(RELEASE).zip" \
  		LICENSE README* icon2.png  \
-@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
+@@ -40,11 +38,11 @@ gresource: .gresource.xml icon2.png
  
  droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
  droidcam-cli: src/droidcam-cli.c $(SRC)
@@ -45,3 +47,16 @@ index 7be3c15..099a707 100644
  
  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