* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/files/, media-plugins/vdr-xineliboutput/
@ 2021-04-07 18:54 Jörg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Bornkessel @ 2021-04-07 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 55fa32bae26c4de869becc09d8a866f0b605e9ac
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 18:54:15 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 18:54:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fa32ba
media-plugins/vdr-xineliboutput: call cc/gcc directly fixed
Closes: https://bugs.gentoo.org/780462
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
media-plugins/vdr-xineliboutput/Manifest | 2 +-
.../files/vdr-xineliboutput-2.2.0_no-gcc.patch | 33 ++++++++++++++++++++++
...r3.ebuild => vdr-xineliboutput-2.2.0-r4.ebuild} | 7 +++--
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 5e739095809..c2fec1236e8 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,2 +1,2 @@
DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-DIST vdr-xineliboutput-2.2.0_c++11.patch.bz2 7609 BLAKE2B fe3b9f8d8fb1425e11e068a410844c2ad4f7afa60ad815ee0918a9ce2fa16e450b418358f7688047a5d5b185bb783890a31cfa174d7dc4b29deb9d96f9295fbd SHA512 8323b73b082ef61fe74ef1110e991c8f8acfcf22ac8ddd9f06cd5f8cba6d0087a5500658e20402b8b590a1bb4f10ad7bf712be12a11c447f943aafa4a32413e3
+DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
new file mode 100644
index 00000000000..ac7cf5007ce
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
@@ -0,0 +1,33 @@
+get rid off call cc gcc directly
+disabled apple darwin check
+we are on gentoo!!!
+https://bugs.gentoo.org/show_bug.cgi?id=780462
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2021/April/07 )
+diff -Naur xineliboutput-2.2.0.orig/Makefile xineliboutput-2.2.0/Makefile
+--- xineliboutput-2.2.0.orig/Makefile 2021-04-07 20:28:54.667000000 +0200
++++ xineliboutput-2.2.0/Makefile 2021-04-07 20:29:31.558000000 +0200
+@@ -19,9 +19,9 @@
+
+ # check for Apple Darwin
+ ARCH_APPLE_DARWIN = no
+-ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
+- ARCH_APPLE_DARWIN = yes
+-endif
++#ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
++# ARCH_APPLE_DARWIN = yes
++#endif
+
+ #
+ # Override configuration here or in ../../../Make.config
+@@ -43,8 +43,8 @@
+ ### The C++ compiler and options:
+ ###
+
+-CXX ?= g++
+-CC ?= gcc
++#CXX ?= g++
++#CC ?= gcc
+ OPTFLAGS ?=
+
+ ifeq ($(ARCH_APPLE_DARWIN), yes)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
similarity index 94%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index beec586bcb2..b9d615c9322 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -10,7 +10,7 @@ GENTOO_VDR_CONDITIONAL=yes
DESCRIPTION="VDR Plugin: Xinelib PlugIn"
HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
- http://vdr.websitec.de/download/${PN}/${P}_c++11.patch.bz2"
+ http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
SLOT="0"
LICENSE="GPL-2+"
@@ -73,8 +73,9 @@ src_prepare() {
# bug 711978
sed -e "s:X11 opengl:X11 OpenGl:" -i configure || die
- # bug 771036, fix compile llvm/clang
- eapply "${WORKDIR}/${P}_c++11.patch"
+ # bug 771036,780462 do not call cc directly
+ eapply "${FILESDIR}/${P}_no-gcc.patch"
+ eapply "${WORKDIR}/${P}_clang.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/files/, media-plugins/vdr-xineliboutput/
@ 2025-08-01 4:19 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-08-01 4:19 UTC (permalink / raw
To: gentoo-commits
commit: a2bc9a1f669dda2cba9129a36c713097fe43ec0a
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sun Jul 14 11:44:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 1 04:18:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bc9a1f
media-plugins/vdr-xineliboutput: drop 2.2.0-r2, 2.2.0-r4
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Part-of: https://github.com/gentoo/gentoo/pull/37550
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/vdr-xineliboutput/files/vdr-frontend | 12 --
.../vdr-xineliboutput-2.2.0-r2.ebuild | 153 --------------------
.../vdr-xineliboutput-2.2.0-r4.ebuild | 159 ---------------------
3 files changed, 324 deletions(-)
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend b/media-plugins/vdr-xineliboutput/files/vdr-frontend
deleted file mode 100644
index ba0b0b1161b2..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-frontend
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Start xineliboutput sxfe/sxfb remote frontend"
-
-. /etc/conf.d/vdr.xineliboutput
-
-command="/usr/bin/vdr-sxfe"
-command_args="${REMOTE_FRONTEND}"
-pidfile="/var/run/vdr-frontend.pid"
-start_stop_daemon_args="--user vdr --group vdr --make-pidfile --background"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
deleted file mode 100644
index ca97c401355d..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="https://downloads.sourceforge.net/${PN#vdr-}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
- vdr? (
- media-video/vdr
- caps? ( sys-libs/libcap )
- )
-
- xine? (
- ( >=media-libs/xine-lib-1.2
- media-video/ffmpeg )
- fbcon? ( jpeg? ( virtual/jpeg:* ) )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- bluray? ( media-libs/libbluray )
- dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
- jpeg? ( virtual/jpeg:* )
- opengl? ( virtual/opengl )
- vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
- vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
- xinerama? ( x11-libs/libXinerama )
- )
- )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-kernel/linux-headers
- nls? ( sys-devel/gettext )
- xine? (
- X? (
- x11-base/xorg-proto
- x11-libs/libXxf86vm
- )
- )"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
- vdr-plugin-2_pkg_setup
-
- if use xine; then
- XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
- [ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
- fi
-}
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- # bug 711978
- sed -e "s:X11 opengl:X11 OpenGl:" -i configure || die
-}
-src_configure() {
- local myconf
-
- if has_version ">=media-libs/xine-lib-1.2"; then
- myconf="${myconf} --enable-libavutil"
- else
- myconf="${myconf} --disable-libavutil"
- fi
-
- # No autotools based configure script
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- $(use_enable X x11) \
- $(use_enable X xshm) \
- $(use_enable X xdpms) \
- $(use_enable X xshape) \
- $(use_enable X xrandr) \
- $(use_enable X xrender) \
- $(use_enable fbcon fb) \
- $(use_enable vdr) \
- $(use_enable xine libxine) \
- --disable-libextractor \
- $(use_enable caps libcap) \
- $(use_enable cec libcec) \
- $(use_enable jpeg libjpeg) \
- $(use_enable xinerama) \
- $(use_enable dbus dbus-glib-1) \
- $(use_enable nls i18n) \
- $(use_enable bluray libbluray) \
- $(use_enable opengl) \
- ${myconf} \
- || die
-
- # UINT64_C is needed by ffmpeg headers
- append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
- if use vdr; then
- vdr-plugin-2_src_install
-
- # bug 346989
- insinto /etc/vdr/plugins/xineliboutput/
- doins examples/allowed_hosts.conf
- fowners -R vdr:vdr /etc/vdr/
-
- if use nls; then
- emake DESTDIR="${D}" i18n
- fi
-
- if use xine; then
- doinitd "${FILESDIR}"/vdr-frontend
-
- insinto $XINE_PLUGIN_DIR
- doins xineplug_inp_xvdr.so
-
- insinto $XINE_PLUGIN_DIR/post
- doins xineplug_post_*.so
-
- if use fbcon; then
- dobin vdr-fbfe
-
- insinto $VDR_PLUGIN_DIR
- doins libxineliboutput-fbfe.so.*
- fi
-
- if use X; then
- dobin vdr-sxfe
-
- insinto $VDR_PLUGIN_DIR
- doins libxineliboutput-sxfe.so.*
- fi
- fi
- else
- emake DESTDIR="${D}" install
-
- dodoc HISTORY README
- fi
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
deleted file mode 100644
index fe2a0e8dc961..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="https://downloads.sourceforge.net/${PN#vdr-}/${P}.tgz
- http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
- vdr? (
- media-video/vdr
- caps? ( sys-libs/libcap )
- )
-
- xine? (
- ( >=media-libs/xine-lib-1.2
- media-video/ffmpeg )
- fbcon? ( jpeg? ( virtual/jpeg:* ) )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- bluray? ( media-libs/libbluray )
- dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
- jpeg? ( virtual/jpeg:* )
- opengl? ( virtual/opengl )
- vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
- vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
- xinerama? ( x11-libs/libXinerama )
- )
- )"
-
-DEPEND="${COMMON_DEPEND}
- sys-kernel/linux-headers
- nls? ( sys-devel/gettext )
- xine? (
- X? (
- x11-base/xorg-proto
- x11-libs/libXxf86vm
- )
- )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
- vdr-plugin-2_pkg_setup
-
- if use xine; then
- XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
- [ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
- fi
-}
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- # bug 711978
- sed -e "s:X11 opengl:X11 OpenGl:" -i configure || die
-
- # bug 771036,780462 do not call cc directly
- eapply "${FILESDIR}/${P}_no-gcc.patch"
- eapply "${WORKDIR}/${P}_clang.patch"
-}
-
-src_configure() {
- local myconf
-
- if has_version ">=media-libs/xine-lib-1.2"; then
- myconf="${myconf} --enable-libavutil"
- else
- myconf="${myconf} --disable-libavutil"
- fi
-
- # No autotools based configure script
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- $(use_enable X x11) \
- $(use_enable X xshm) \
- $(use_enable X xdpms) \
- $(use_enable X xshape) \
- $(use_enable X xrandr) \
- $(use_enable X xrender) \
- $(use_enable fbcon fb) \
- $(use_enable vdr) \
- $(use_enable xine libxine) \
- --disable-libextractor \
- $(use_enable caps libcap) \
- $(use_enable cec libcec) \
- $(use_enable jpeg libjpeg) \
- $(use_enable xinerama) \
- $(use_enable dbus dbus-glib-1) \
- $(use_enable nls i18n) \
- $(use_enable bluray libbluray) \
- $(use_enable opengl) \
- ${myconf} \
- || die
-
- # UINT64_C is needed by ffmpeg headers
- append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
- if use vdr; then
- vdr-plugin-2_src_install
-
- # bug 346989
- insinto /etc/vdr/plugins/xineliboutput/
- doins examples/allowed_hosts.conf
- fowners -R vdr:vdr /etc/vdr/
-
- if use nls; then
- emake DESTDIR="${D}" i18n
- fi
-
- if use xine; then
- doinitd "${FILESDIR}"/vdr-frontend
-
- insinto $XINE_PLUGIN_DIR
- doins xineplug_inp_xvdr.so
-
- insinto $XINE_PLUGIN_DIR/post
- doins xineplug_post_*.so
-
- if use fbcon; then
- dobin vdr-fbfe
-
- insinto $VDR_PLUGIN_DIR
- doins libxineliboutput-fbfe.so.*
- fi
-
- if use X; then
- dobin vdr-sxfe
-
- insinto $VDR_PLUGIN_DIR
- doins libxineliboutput-sxfe.so.*
- fi
- fi
- else
- emake DESTDIR="${D}" install
-
- dodoc HISTORY README
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-01 4:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-01 4:19 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/files/, media-plugins/vdr-xineliboutput/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-04-07 18:54 Jörg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox