mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-17 11:04:10 -04:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -1 +0,0 @@
|
||||
DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba
|
||||
@@ -1,147 +0,0 @@
|
||||
# Copyright 2019-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit desktop linux-mod readme.gentoo-r1 xdg
|
||||
|
||||
DESCRIPTION="Use android phone as webcam, using a v4l device driver and app"
|
||||
HOMEPAGE="https://www.dev47apps.com/droidcam/linux/
|
||||
https://github.com/aramg/droidcam"
|
||||
SRC_URI="https://github.com/aramg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="gtk"
|
||||
|
||||
# Requires connection to phone
|
||||
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
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( README.md README-DKMS.md )
|
||||
DISABLE_AUTOFORMATTING="true"
|
||||
DOC_CONTENTS="
|
||||
The default resolution for v4l2loopback-dc[1] is 640x480. You can override the
|
||||
value by copying droidcam.conf.default to /etc/modprobe.d/droidcam.conf
|
||||
and modifying 'width' and 'height'.
|
||||
[1] https://github.com/aramg/droidcam/issues/56
|
||||
"
|
||||
|
||||
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 required for audio support"
|
||||
|
||||
PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
|
||||
|
||||
src_prepare() {
|
||||
if ! use gtk ; then
|
||||
sed -i -e '/cflags gtk+/d' Makefile || die
|
||||
else
|
||||
# remove path and extension from icon entry
|
||||
sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' droidcam.desktop || die
|
||||
xdg_src_prepare
|
||||
fi
|
||||
linux-mod_pkg_setup
|
||||
}
|
||||
|
||||
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"
|
||||
default
|
||||
./test || die
|
||||
popd
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use gtk ; then
|
||||
dobin droidcam
|
||||
newicon -s 32 icon.png droidcam.png
|
||||
newicon -s 48 icon2.png droidcam.png
|
||||
domenu droidcam.desktop
|
||||
fi
|
||||
dobin "${PN}-cli"
|
||||
|
||||
readme.gentoo_create_doc
|
||||
|
||||
# The cli and gui do not auto load the module if unloaded (why not tho?)
|
||||
# so we just put it in modules-load.d to make sure it always works
|
||||
insinto /etc/modules-load.d
|
||||
doins "${FILESDIR}"/${PN}-video.conf
|
||||
if linux_config_exists ; then
|
||||
if linux_chkconfig_module SND_ALOOP ; then
|
||||
doins "${FILESDIR}"/${PN}-audio.conf
|
||||
fi
|
||||
fi
|
||||
|
||||
newdoc "${FILESDIR}"/${PN}-modprobe.conf ${PN}.conf.default
|
||||
einstalldocs
|
||||
linux-mod_src_install
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
linux-mod_pkg_postinst
|
||||
readme.gentoo_print_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
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
snd_aloop
|
||||
@@ -1,47 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b5f696c..bcb5800 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
# 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`
|
||||
|
||||
@@ -16,15 +16,15 @@ 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
|
||||
-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 +40,11 @@ gresource: .gresource.xml icon2.png
|
||||
|
||||
droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
|
||||
droidcam-cli: src/droidcam-cli.c $(SRC)
|
||||
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
|
||||
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
|
||||
droidcam: src/droidcam.c src/resources.c $(SRC)
|
||||
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
|
||||
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
clean:
|
||||
rm -f droidcam
|
||||
@@ -1,2 +0,0 @@
|
||||
# Suggested values: 640×480, 960×720, 1280×720 (720p), 1920×1080 (1080p).
|
||||
options v4l2loopback-dc width=640 height=480
|
||||
@@ -1 +0,0 @@
|
||||
v4l2loopback-dc
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>andrewammerlaan@gentoo.org</email>
|
||||
<name>Andrew Ammerlaan</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="gtk">Build the <pkg>dev-cpp/gtkmm</pkg>:3.0 client.</flag>
|
||||
</use>
|
||||
<longdescription>
|
||||
DroidCam allows you to use your Android or iOS device as webcam, wired (USB
|
||||
and ADB) or wireless (TCP/IP). Works with the free version of the phone app.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">aramg/droidcam</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,3 +1,4 @@
|
||||
move sys-apps/nq sys-process/nq
|
||||
move www-client/browsh-bin www-client/browsh
|
||||
move app-misc/pup-bin app-misc/pup
|
||||
move media-tv/droidcam media-video/droidcam
|
||||
|
||||
Reference in New Issue
Block a user