summaryrefslogtreecommitdiff
path: root/source/xap/xine-ui
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/xap/xine-ui
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/xap/xine-ui')
-rw-r--r--source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch27
-rwxr-xr-xsource/xap/xine-ui/xine-ui.SlackBuild5
-rw-r--r--source/xap/xine-ui/xine.desktop14
3 files changed, 0 insertions, 46 deletions
diff --git a/source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch b/source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch
deleted file mode 100644
index 448c9d3e..00000000
--- a/source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2013-04-17
-Initial Package Version: 0.99.7
-Upstream Status: Applied
-Origin: Upstream (Torsten Jager)
-Description: The change to use a png logo before 0.99.7 overlooked
-that static graphics have a different status in xine-lib (they never
-stop). That broke opening a file from the 'Open' menu (opening from
-the MRL Browser, or from a file passed on the command lein were OK).
-
-Upstream revision r3135:
-
-open user file immediately when only logo is playing
-
-diff -r 653d3359d87a -r edb37ede1ab2 src/xitk/actions.c
---- a/src/xitk/actions.c Tue Mar 19 22:29:33 2013 +0200
-+++ b/src/xitk/actions.c Mon Apr 15 19:56:17 2013 +0300
-@@ -2148,7 +2148,8 @@
-
- /* If an MRL is not being played, select the first file appended. If in "smart mode" start
- playing the entry. If a an MRL is currently being played, let it continue normally */
-- if((first != gGui->playlist.num) && (xine_get_status(gGui->stream) == XINE_STATUS_STOP)) {
-+ if((first != gGui->playlist.num) &&
-+ (gGui->logo_mode || (xine_get_status(gGui->stream) == XINE_STATUS_STOP))) {
- gGui->playlist.cur = first;
- if(gGui->smart_mode) {
- gui_set_current_mmk(mediamark_get_current_mmk());
diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild
index 228936c0..2cef59a5 100755
--- a/source/xap/xine-ui/xine-ui.SlackBuild
+++ b/source/xap/xine-ui/xine-ui.SlackBuild
@@ -57,8 +57,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-zcat $CWD/xine-ui-0.99.7-upstream_fix-1.patch.gz | patch -p1 --verbose || exit 1
-
XINE_BUILD=$TARGET \
./configure \
--prefix=/usr \
@@ -71,9 +69,6 @@ XINE_BUILD=$TARGET \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-mkdir -p $PKG/usr/share/applications
-zcat $CWD/xine.desktop.gz > $PKG/usr/share/applications/xine.desktop
-
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/xap/xine-ui/xine.desktop b/source/xap/xine-ui/xine.desktop
deleted file mode 100644
index 0936a4e9..00000000
--- a/source/xap/xine-ui/xine.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Xine
-Name[pl]=Odtwarzacz xine
-GenericName=Media Player
-Comment=Xine Media Player
-Comment[pl]=Odtwarzacz filmów
-Icon=xine.xpm
-Exec=xine
-Terminal=0
-Type=Application
-Categories=Application;AudioVideo;Player;
-MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;
-# vi: encoding=utf-8