From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F9EC13835A for ; Wed, 13 Jan 2021 16:51:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E748E087E; Wed, 13 Jan 2021 16:51:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F01CEE087E for ; Wed, 13 Jan 2021 16:51:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F558340DA8 for ; Wed, 13 Jan 2021 16:51:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2074F498 for ; Wed, 13 Jan 2021 16:51:09 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1610556352.9748372d467163b9aec41571ba9aabc16a0f73fa.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/, media-tv/droidcam/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-tv/droidcam/Manifest media-tv/droidcam/droidcam-1.6.ebuild media-tv/droidcam/droidcam-1.7.ebuild media-tv/droidcam/files/droidcam-makefile-fixes.patch X-VCS-Directories: media-tv/droidcam/ media-tv/droidcam/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9748372d467163b9aec41571ba9aabc16a0f73fa X-VCS-Branch: master Date: Wed, 13 Jan 2021 16:51:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f2b5aaa-7b22-40b7-b12f-9b2a8c3ce997 X-Archives-Hash: 4cd64294621f09c35252ffec1ac62335 Message-ID: <20210113165109.fh6cZC1xGPGX-TngJaLshJdHpAXm1RJu3MuKycG8Lrw@z> commit: 9748372d467163b9aec41571ba9aabc16a0f73fa Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Jan 13 16:45:52 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Jan 13 16:45:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9748372d media-tv/droidcam: version bump 1.7 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> media-tv/droidcam/Manifest | 2 +- .../droidcam/{droidcam-1.6.ebuild => droidcam-1.7.ebuild} | 12 +++++++----- media-tv/droidcam/files/droidcam-makefile-fixes.patch | 14 +++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest index 4cd9ee57..74545b19 100644 --- a/media-tv/droidcam/Manifest +++ b/media-tv/droidcam/Manifest @@ -1 +1 @@ -DIST droidcam-1.6.tar.gz 80673 BLAKE2B 11e121b1e46a873404bdcd3794248dcb8006f9a3e78eaa1571c7b6e0299f9f7bf50bca28b294a7661e7d4d336ea680b29b4ece134d661ba0a17ab8793ef1a232 SHA512 09b41093ee09c65199809871a1d8cdc959323325bc734546396a8b31442f4665d1df4b846e37deb398c741756d2e94a219e73256598cc63e625a73fb93387d7b +DIST droidcam-1.7.tar.gz 81605 BLAKE2B 81d2ffa1b3cb0f9791c4459c75aeaacb701d03cbde11c76cd18ff569854f304b5bb359552a9c0a3a8bbb32f2d9c0fa8bdc7a2eec9b60a047138098c3dea4aaf4 SHA512 d41df620734c51fca49d411b96cd2889269df9548044af2c0b165025f08205a5a99a9e4c5896742174833a2b00ed89d8dd955b593d4acc39cbac658282841439 diff --git a/media-tv/droidcam/droidcam-1.6.ebuild b/media-tv/droidcam/droidcam-1.7.ebuild similarity index 90% rename from media-tv/droidcam/droidcam-1.6.ebuild rename to media-tv/droidcam/droidcam-1.7.ebuild index 42caab29..aee0b786 100644 --- a/media-tv/droidcam/droidcam-1.6.ebuild +++ b/media-tv/droidcam/droidcam-1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SLOT="0" IUSE="gtk" -# Requires connection to android phone +# Requires connection to phone RESTRICT="test" DEPEND=" @@ -39,7 +39,7 @@ DEPEND=" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${P}/linux" +RDEPEND="${DEPEND}" DOCS=( README.md README-DKMS.md ) DISABLE_AUTOFORMATTING="true" @@ -61,8 +61,10 @@ PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" src_prepare() { if ! use gtk ; then - sed -i -e '/cflags gtk+/d' Makefile + 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 @@ -97,7 +99,7 @@ src_install() { dobin droidcam newicon -s 32 icon.png droidcam.png newicon -s 48 icon2.png droidcam.png - make_desktop_entry "${PN}" "DroidCam Client" "${PN}" AudioVideo + domenu droidcam.desktop fi dobin "${PN}-cli" diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch index 4fe51776..33270582 100644 --- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch +++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 91ca3af..16afe8b 100644 +index d1c514e..5abd541 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ @@ -23,15 +23,15 @@ index 91ca3af..16afe8b 100644 all: droidcam-cli droidcam - ifeq "$(RELEASE)" "1" + ifneq "$(RELEASE)" "" -LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a --SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.a /usr/lib/x86_64-linux-gnu/libxml2.a src/libplist-2.0.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 += /usr/lib/x86_64-linux-gnu/libusbmuxd-2.0.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so ++SRC += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so package: clean all - zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./* - -@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png + zip "droidcam_$(RELEASE).zip" \ + LICENSE README* icon2.png \ +@@ -39,10 +39,10 @@ gresource: .gresource.xml icon2.png glib-compile-resources .gresource.xml --generate-source --target=src/resources.c droidcam-cli: src/droidcam-cli.c $(SRC)