public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
@ 2017-06-17 22:20 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-06-17 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c220d3de3aad17c6ac3b5d619edac0796ac96cb9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 22:20:16 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 22:20:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c220d3de

media-video/xine-ui: Removed old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-video/xine-ui/Manifest                       |  2 -
 .../files/xine-ui-0.99.8-readline-6.3.patch        | 33 --------
 media-video/xine-ui/xine-ui-0.99.7.ebuild          | 93 ----------------------
 media-video/xine-ui/xine-ui-0.99.8.ebuild          | 93 ----------------------
 4 files changed, 221 deletions(-)

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 958bc8bff6b..5a08b8c804e 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,3 +1 @@
-DIST xine-ui-0.99.7.tar.xz 1752328 SHA256 9d8cdfd1c5c84251d6978765b059adf57099ff6c447f3e4b59066c8563f66bc4 SHA512 6070d28cb3f5bb816b1f218d07c5e0001e71069dfc6b6c761b95960f095736923a6e83a97dfab88d93688c1029a7c1d30dc4a2327e2c8481b3b06cb7cc837c1f WHIRLPOOL 7b7b87b56029c11d3ea1036420dca09e730370294659cadc0e5937cd36383e84a941f89bd69535566ffc8cd639aa21ea439ba1e82b1f46fa6211ecf7cc4a09f1
-DIST xine-ui-0.99.8.tar.xz 1758372 SHA256 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7 SHA512 a2d11b0c512b9d485e0bbe418b36fb5fd52fe1a9c68cdb865771fc580b30bff513825f3e24ef85a902669c2c1ea8947512dd9abe4c12fdef94b8852cc8588da3 WHIRLPOOL c7d67f94422dfdbd609b3e2d880134a2e2d414981d229870157c10f5c54928101336f83f70d6c56c8da238fd25933b4490958e379d2d0a64721553f3fd7d6638
 DIST xine-ui-0.99.9.tar.xz 1759568 SHA256 8dd180219f546a7be0a5651370996b95b3a38ec97bf01b57d2bd1cb966e591a2 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7 WHIRLPOOL 7bce787c8718e057a33af2ad33efc2ab1ed4358181f2b626e871f79c396b6b900ccf3631a302463f93951199eeae19887fb2c7d4a5eddf137c85664b99424b8a

diff --git a/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch b/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
deleted file mode 100644
index 3799975d0af..00000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=504208
-
-Fix building with readline >= 6.3 API (see network.c change)
-Fix another crash on exit (see main.c change)
-
-patches/debian-changes from xine-ui_0.99.8-2.debian.tar.xz at http://packages.debian.org/xine-ui
-
---- src/xitk/main.c
-+++ src/xitk/main.c
-@@ -1255,8 +1255,10 @@ static void event_listener(void *user_da
-       gGui->mixer.volume_level = (aevent->left + aevent->right) / 2;
-       if(gGui->mixer.method == SOUND_CARD_MIXER) {
- 	gGui->mixer.mute = aevent->mute;
--	xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
--	xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
-+	if (panel) {
-+	  xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
-+	  xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
-+	}
-       }
-     }
-     break;
---- src/xitk/network.c
-+++ src/xitk/network.c
-@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
-   rl_readline_name = PROGNAME;
-   rl_set_prompt(session.prompt);
-   rl_initialize();
--  rl_attempted_completion_function = (CPPFunction *)completion_function;
-+  rl_attempted_completion_function = completion_function;
-   
-   signal(SIGPIPE, SIG_IGN);
-   

diff --git a/media-video/xine-ui/xine-ui-0.99.7.ebuild b/media-video/xine-ui/xine-ui-0.99.7.ebuild
deleted file mode 100644
index d3a72dd82f2..00000000000
--- a/media-video/xine-ui/xine-ui-0.99.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0
-	>=media-libs/xine-lib-1.2[aalib?,libcaca?]
-	virtual/jpeg
-	aalib? ( media-libs/aalib )
-	curl? ( >=net-misc/curl-7.10.2 )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	readline? ( =sys-libs/readline-6.2* )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		xinerama? ( x11-libs/libXinerama )
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	X? (
-		x11-libs/libXt
-		x11-proto/inputproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		)
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm -f misc/xine-bugreport
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}

diff --git a/media-video/xine-ui/xine-ui-0.99.8.ebuild b/media-video/xine-ui/xine-ui-0.99.8.ebuild
deleted file mode 100644
index 75dad770c28..00000000000
--- a/media-video/xine-ui/xine-ui-0.99.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0=
-	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
-	aalib? ( media-libs/aalib:= )
-	curl? ( >=net-misc/curl-7.10.2:= )
-	libcaca? ( media-libs/libcaca:= )
-	lirc? ( app-misc/lirc:= )
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-6.2:= )
-	X? (
-		x11-libs/libICE:=
-		x11-libs/libSM:=
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXft:=
-		x11-libs/libXrender:=
-		x11-libs/libXScrnSaver:=
-		x11-libs/libXtst:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		xinerama? ( x11-libs/libXinerama:= )
-		)"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.18.3 )
-	X? (
-		x11-libs/libXt
-		x11-proto/inputproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		)
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-readline-6.3.patch
-	rm -f misc/xine-bugreport
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
@ 2020-12-20 17:37 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-12-20 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     16d4cd63d9da05976baf7775121bb88b81d45343
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 17:36:55 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 17:36:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d4cd63

media-video/xine-ui: cleanup old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/xine-ui/Manifest                       |   1 -
 .../xine-ui/files/xine-ui-0.99.10-libcaca.patch    |  24 -----
 media-video/xine-ui/xine-ui-0.99.10.ebuild         | 101 ---------------------
 3 files changed, 126 deletions(-)

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 9a9fc901207..51b189beb21 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,2 +1 @@
-DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86

diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
deleted file mode 100644
index c5a359758d4..00000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r efe11fb1562e configure.ac
---- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
-@@ -374,7 +374,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-      AM_DL()
-    fi
-    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
-
---- a/configure 	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
-@@ -12651,7 +12651,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
- $as_echo_n "checking for dlopen in -lc... " >&6; }

diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
deleted file mode 100644
index eacab2930ba..00000000000
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="https://xine-project.org/home"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="
-	|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0=
-	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
-	aalib? ( media-libs/aalib:= )
-	curl? ( >=net-misc/curl-7.10.2:= )
-	libcaca? ( media-libs/libcaca:= )
-	lirc? ( app-misc/lirc:= )
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-6.2:= )
-	X? (
-		x11-libs/libICE:=
-		x11-libs/libSM:=
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXft:=
-		x11-libs/libXrender:=
-		x11-libs/libXScrnSaver:=
-		x11-libs/libXtst:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		xinerama? ( x11-libs/libXinerama:= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.3 )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-libcaca.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	rm misc/xine-bugreport || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	# xine-list apparently may cause sandbox violation, bug 654394
-	addpredict /dev/dri
-
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
@ 2022-09-30  2:14 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-09-30  2:14 UTC (permalink / raw
  To: gentoo-commits

commit:     7a0da2bafd776dfc30935a497316ec668a10aa24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 02:14:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 02:14:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0da2ba

media-video/xine-ui: backport build fix patch

Closes: https://bugs.gentoo.org/871951
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xine-ui/files/xine-ui-0.99.13-build.patch      | 43 ++++++++++++++++++++++
 media-video/xine-ui/xine-ui-0.99.13.ebuild         |  1 +
 2 files changed, 44 insertions(+)

diff --git a/media-video/xine-ui/files/xine-ui-0.99.13-build.patch b/media-video/xine-ui/files/xine-ui-0.99.13-build.patch
new file mode 100644
index 000000000000..dc24720d97da
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.13-build.patch
@@ -0,0 +1,43 @@
+hg diff -r e352b6eef94b6441f4afc86f96abe247acc2a60b -r f9a98e02460348ca23ca2f5c2b39e62c8758b22d
+https://sourceforge.net/p/xine/xine-ui/ci/e352b6eef94b6441f4afc86f96abe247acc2a60b/
+https://sourceforge.net/p/xine/tickets/10/
+https://bugs.gentoo.org/871951
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -600,8 +600,10 @@ int n = my_strlen ("what");
+ ])], [have_attr_iaso=yes], [have_attr_iaso=no])
+ AC_MSG_RESULT([$have_attr_iaso])
+ if test x"$have_attr_iaso" = x"yes" ; then
+-    AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS],
+-        [__attribute__ ((__target__ ("inline-all-stringops")))],
++    AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [__attribute__ ((__target__ ("inline-all-stringops")))],
++        [Define this to a function attribute that inlines string handling code])
++else
++    AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [],
+         [Define this to a function attribute that inlines string handling code])
+ fi
+ 
+--- a/src/common/utils.h
++++ b/src/common/utils.h
+@@ -21,7 +21,7 @@
+ #ifndef _COMMON_UTILS_H
+ #define _COMMON_UTILS_H
+ 
+-#ifndef HAVE_CONFIG_H
++#ifndef PACKAGE_NAME
+ #error config.h not included
+ #endif
+ 
+--- a/src/xitk/network.c
++++ b/src/xitk/network.c
+@@ -34,7 +34,9 @@
+ 
+ //#warning IMPLEMENT POST SUPPORT
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifdef HAVE_READLINE
+ 

diff --git a/media-video/xine-ui/xine-ui-0.99.13.ebuild b/media-video/xine-ui/xine-ui-0.99.13.ebuild
index 799cc50106f2..cba68d230908 100644
--- a/media-video/xine-ui/xine-ui-0.99.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.13.ebuild
@@ -50,6 +50,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.99.10-desktop.patch
+	"${FILESDIR}"/${P}-build.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
@ 2023-12-19 11:04 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-12-19 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     124f74d5cacaa50108ae1eddc8783bb0d49ebe1b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 10:12:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:03:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124f74d5

media-video/xine-ui: fix modern C issues in configure

Closes: https://bugs.gentoo.org/899872
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xine-ui-0.99.13-configure-c99.patch      | 77 ++++++++++++++++++
 media-video/xine-ui/xine-ui-0.99.13-r1.ebuild      | 90 ++++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/media-video/xine-ui/files/xine-ui-0.99.13-configure-c99.patch b/media-video/xine-ui/files/xine-ui-0.99.13-configure-c99.patch
new file mode 100644
index 000000000000..dfb82175b587
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.13-configure-c99.patch
@@ -0,0 +1,77 @@
+https://sourceforge.net/p/xine/tickets/22/
+https://bugs.gentoo.org/899872
+
+Fix C compatibility issues in the configure script
+
+This is necessary to avoid incorrectly failing probes due to expected
+compiler errors.
+
+Include <stdlib.h> for the exit function, and <string.h> for the
+strdup function.
+
+Use fake prototypes to avoid implicit function declarations in the
+xine_* function probes.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -198,6 +198,7 @@
+   if test "$ac_cv_header_sys_shm_h" = "yes"; then
+     AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
+     AC_TRY_RUN([
++	  #include <stdlib.h>
+           #include <sys/types.h>
+           #include <sys/ipc.h>
+           #include <sys/shm.h>
+--- a/m4/aa.m4
++++ b/m4/aa.m4
+@@ -52,6 +52,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <aalib.h>
++#include <string.h>
+ 
+ int main () {
+   int major, minor;
+--- a/m4/_xine.m4
++++ b/m4/_xine.m4
+@@ -218,7 +218,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_open_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_open_cloexec(void);],[xine_open_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_OPEN_CLOEXEC], [1], [Define if xine-lib supports xine_open_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -234,7 +234,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_socket_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_socket_cloexec(void);],[xine_socket_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_SOCKET_CLOEXEC], [1], [Define if xine-lib supports xine_socket_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -250,7 +250,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([
++         [AC_LANG_PROGRAM([char xine_list_next_value(void);
+          ],[
+ xine_list_next_value ();
+          ])],
+diff --git a/configure.ac b/configure.ac
+index 5b4fb04..8bcbfea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -634,7 +634,8 @@ dnl
+ AC_MSG_CHECKING(whether librt is needed)
+ AC_TRY_COMPILE(
+ 	[#include <unistd.h>
+-	 #include <sys/time.h>],
++	 #include <sys/time.h>
++         #include <time.h>],
+ 	[#if _POSIX_TIMERS > 0
+ 	 struct timespec ts;
+ 	 clock_gettime(CLOCK_REALTIME, &ts);

diff --git a/media-video/xine-ui/xine-ui-0.99.13-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.13-r1.ebuild
new file mode 100644
index 000000000000..4bebb115b9cc
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.13-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 autotools xdg
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="https://xine-project.org/home"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
+
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	media-libs/libjpeg-turbo:=
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99.10-desktop.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${PN}-0.99.13-configure-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
@ 2024-11-24 23:15 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-11-24 23:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f6da4e1cd14721a2d60f53374b7636806831c402
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 23:12:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 23:15:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6da4e1c

media-video/xine-ui: add 0.99.14

Old codebase so -std=gnu17.

Closes: https://bugs.gentoo.org/944213
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/xine-ui/Manifest                       |  1 +
 .../files/xine-ui-0.99.14-configure-c99.patch      | 75 ++++++++++++++++++
 media-video/xine-ui/xine-ui-0.99.14.ebuild         | 92 ++++++++++++++++++++++
 3 files changed, 168 insertions(+)

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index da5c7493057a..9bbd192704bf 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1 +1,2 @@
 DIST xine-ui-0.99.13.tar.xz 2156892 BLAKE2B edb4cb082faeba5f9f64ea06f6561d471fddfc7672dd92ec1a0a99b5c8eb10f46c15df2044fa2a4eaafdeab1fa56d990afa443f912602fdc676d1e34e3cf6c84 SHA512 a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
+DIST xine-ui-0.99.14.tar.xz 2214740 BLAKE2B 8785215bd3569dd2f056cb87c16233103bf89d50a188f4e47d2bac07366b58e5c73016097a6d87e8e097d56e1216b639704a0c5a55877c9304151f9caabf3d15 SHA512 e925e2f1d02c4eac4615f59c99dd95f1627617f2abb644c521cf015f795c66bf56386e7d414b528c1cf91bbdab53f46999104e992aecebbdcb62c230e6d989e7

diff --git a/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch b/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch
new file mode 100644
index 000000000000..79ee61544047
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch
@@ -0,0 +1,75 @@
+https://sourceforge.net/p/xine/tickets/22/
+https://bugs.gentoo.org/899872
+
+Fix C compatibility issues in the configure script
+
+This is necessary to avoid incorrectly failing probes due to expected
+compiler errors.
+
+Include <stdlib.h> for the exit function, and <string.h> for the
+strdup function.
+
+Use fake prototypes to avoid implicit function declarations in the
+xine_* function probes.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -198,6 +198,7 @@
+   if test "$ac_cv_header_sys_shm_h" = "yes"; then
+     AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
+     AC_TRY_RUN([
++	  #include <stdlib.h>
+           #include <sys/types.h>
+           #include <sys/ipc.h>
+           #include <sys/shm.h>
+--- a/m4/aa.m4
++++ b/m4/aa.m4
+@@ -52,6 +52,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <aalib.h>
++#include <string.h>
+ 
+ int main () {
+   int major, minor;
+--- a/m4/_xine.m4
++++ b/m4/_xine.m4
+@@ -218,7 +218,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_open_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_open_cloexec(void);],[xine_open_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_OPEN_CLOEXEC], [1], [Define if xine-lib supports xine_open_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -234,7 +234,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_socket_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_socket_cloexec(void);],[xine_socket_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_SOCKET_CLOEXEC], [1], [Define if xine-lib supports xine_socket_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -250,7 +250,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([
++         [AC_LANG_PROGRAM([char xine_list_next_value(void);
+          ],[
+ xine_list_next_value ();
+          ])],
+--- a/configure.ac
++++ b/configure.ac
+@@ -641,7 +641,8 @@ dnl
+ dnl Check for clock_gettime() in librt
+ dnl
+ AC_MSG_CHECKING(whether librt is needed)
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
++                                     #include <unistd.h>
+                                      #include <sys/time.h>]],
+                                    [[#if _POSIX_TIMERS > 0
+                                      struct timespec ts;

diff --git a/media-video/xine-ui/xine-ui-0.99.14.ebuild b/media-video/xine-ui/xine-ui-0.99.14.ebuild
new file mode 100644
index 000000000000..c7dccde4efc3
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.14.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="https://xine-project.org/home"
+SRC_URI="https://downloads.sourceforge.net/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
+
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	media-libs/libjpeg-turbo:=
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99.10-desktop.patch
+	"${FILESDIR}"/${PN}-0.99.14-configure-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
+}
+
+src_configure() {
+	# bug #944213
+	append-cflags -std=gnu17
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-11-24 23:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-20 17:37 [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-11-24 23:15 Sam James
2023-12-19 11:04 Sam James
2022-09-30  2:14 Sam James
2017-06-17 22:20 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox