* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/files/, media-video/xine-ui/
@ 2018-10-03 16:13 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-10-03 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 224b9ef113b7fe96a6130b023da57be16577e270
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 3 16:12:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 3 16:12:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224b9ef1
media-video/xine-ui: EAPI-6 bump, fix USE=libcaca
Thanks-to: Joshua Clayton <stillcompiling <AT> gmail.com>
Closes: https://bugs.gentoo.org/652210
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../xine-ui/files/xine-ui-0.99.10-libcaca.patch | 24 ++++++++++++++++++++
media-video/xine-ui/xine-ui-0.99.10.ebuild | 26 +++++++++++++---------
2 files changed, 39 insertions(+), 11 deletions(-)
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
new file mode 100644
index 00000000000..c5a359758d4
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
@@ -0,0 +1,24 @@
+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
index 90ab46eefcf..905b7daa267 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
inherit gnome2-utils xdg-utils
DESCRIPTION="Xine movie player"
@@ -13,7 +14,8 @@ 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 )
+RDEPEND="
+ || ( app-arch/tar app-arch/libarchive )
media-libs/libpng:0=
>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
virtual/jpeg:0
@@ -35,17 +37,22 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
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
- )
- virtual/pkgconfig"
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-libcaca.patch )
src_prepare() {
- rm -f misc/xine-bugreport
+ default
+ rm misc/xine-bugreport || die
}
src_configure() {
@@ -70,11 +77,8 @@ src_install() {
docdir="/usr/share/doc/${PF}" \
docsdir="/usr/share/doc/${PF}" \
install
- dodoc AUTHORS ChangeLog NEWS README
-}
-pkg_preinst() {
- gnome2_icon_savelist
+ einstalldocs
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/files/, media-video/xine-ui/
@ 2018-10-03 18:06 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-10-03 18:06 UTC (permalink / raw
To: gentoo-commits
commit: a248b92d13cc2d8ca840a3f53e17b4000ab2fca5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 3 17:58:08 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 3 18:05:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a248b92d
media-video/xine-ui: QA: Fix .desktop file
Closes: https://bugs.gentoo.org/486358
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../xine-ui/files/xine-ui-0.99.10-desktop.patch | 23 ++++++++++++++++++++++
media-video/xine-ui/xine-ui-0.99.10.ebuild | 8 ++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
new file mode 100644
index 00000000000..04aecb7ccf1
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -0,0 +1,23 @@
+--- a/misc/desktops/xine.desktop.in 2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/xine.desktop.in 2018-10-03 18:53:23.909196224 +0200
+@@ -6,5 +6,5 @@
+ Icon=xine
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Player;
+-MimeType=
+\ No newline at end of file
++Categories=AudioVideo;Player;
++MimeType=
+\ No newline at end of file
+--- a/misc/desktops/Makefile.am 2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/Makefile.am 2018-10-03 19:52:23.262534618 +0200
+@@ -32,7 +32,7 @@
+ if XINE_LIST
+ xine.desktop: xine.desktop.in @XINE_LIST@
+ $(AM_V_GEN)cat $< > $@; \
+- @XINE_LIST@ | perl -ne 'print join(";",sort(split(";")))' >> $@; \
++ @XINE_LIST@ | perl -ne 'print join("\n",split(";"))' | sort -u | xargs | perl -ne 'print join(";",sort(split(" ")))' >> $@; \
+ echo ';$(INPUT_MIME_TYPES)' >> $@
+ else
+ XINE_MIME = $(if $(shell test "$(XINE_CONFIG)" = '' && echo y),$(shell pkg-config --variable=plugindir libxine),$(shell $(XINE_CONFIG) --plugindir))/mime.types
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index 12355a49bf9..66fffbd153c 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit gnome2-utils xdg-utils
+inherit autotools gnome2-utils xdg-utils
DESCRIPTION="Xine movie player"
HOMEPAGE="https://xine-project.org/home"
@@ -48,10 +48,14 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}"/${P}-libcaca.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-desktop.patch
+ "${FILESDIR}"/${P}-libcaca.patch
+)
src_prepare() {
default
+ eautoreconf
rm misc/xine-bugreport || die
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-03 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-03 18:06 [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/files/, media-video/xine-ui/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-10-03 16:13 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox