From 0b3152f8c4766225696b0c76ca39469955f23224 Mon Sep 17 00:00:00 2001 From: Francisco Javier Félix Date: Thu, 19 Oct 2023 15:08:38 +0200 Subject: net-misc/gerbera: fix preserved libs with media-gfx/exiv2 Show this warning: >>> package: media-gfx/exiv2-0.28.0 * - /usr/lib64/libexiv2.so.0.27.7 * - /usr/lib64/libexiv2.so.27 * used by /usr/bin/gerbera (net-misc/gerbera-1.12.1) Signed-off-by: INODE64 Signed-off-by: Florian Schmaus Closes: https://github.com/gentoo/gentoo/pull/33409 --- net-misc/gerbera/gerbera-1.12.1-r1.ebuild | 90 +++++++++++++++++++++++++++++++ net-misc/gerbera/gerbera-1.12.1.ebuild | 90 ------------------------------- net-misc/gerbera/gerbera-9999.ebuild | 2 +- 3 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 net-misc/gerbera/gerbera-1.12.1-r1.ebuild delete mode 100644 net-misc/gerbera/gerbera-1.12.1.ebuild diff --git a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild new file mode 100644 index 000000000000..2691f65a7c4f --- /dev/null +++ b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" + +RDEPEND=" + acct-user/gerbera + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2:= ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) +" + +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=NO + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} + + insinto /etc/${PN} + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-1.12.1.ebuild b/net-misc/gerbera/gerbera-1.12.1.ebuild deleted file mode 100644 index 00f14f51b749..000000000000 --- a/net-misc/gerbera/gerbera-1.12.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-info - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" - -RDEPEND=" - acct-user/gerbera - dev-db/sqlite - dev-libs/libebml:= - dev-libs/libfmt:= - dev-libs/pugixml - dev-libs/spdlog:= - >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( media-video/ffmpeg:= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - javascript? ( dev-lang/duktape:= ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska:= ) - mysql? ( dev-db/mysql-connector-c ) - taglib? ( media-libs/taglib ) -" - -DEPEND="${RDEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -src_configure() { - local mycmakeargs=( - -DWITH_AVCODEC=$(usex ffmpeg) - -DWITH_CURL=$(usex curl) - -DWITH_DEBUG=$(usex debug) - -DWITH_EXIF=$(usex exif) - -DWITH_EXIV2=$(usex exiv2) - -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) - -DWITH_INOTIFY=1 - -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=NO - -DWITH_MAGIC=$(usex magic) - -DWITH_MATROSKA=$(usex matroska) - -DWITH_MYSQL=$(usex mysql) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TAGLIB=$(usex taglib) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} - newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} - - insinto /etc/${PN} - newins "${FILESDIR}"/${PN}-1.3.0.config config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - if use mysql; then - elog "Gerbera has been built with MySQL support and needs" - elog "to be configured before being started. By default" - elog "SQLite will be used." - fi -} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 00f14f51b749..2691f65a7c4f 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -34,7 +34,7 @@ RDEPEND=" virtual/libiconv curl? ( net-misc/curl ) exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) + exiv2? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) javascript? ( dev-lang/duktape:= ) -- cgit v1.2.3-65-gdbad