diff options
Diffstat (limited to 'source/xap/xine-ui')
| -rw-r--r-- | source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch | 27 | ||||
| -rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 5 | ||||
| -rw-r--r-- | source/xap/xine-ui/xine.desktop | 14 |
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 448c9d3e4..000000000 --- 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 228936c0b..2cef59a52 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 0936a4e99..000000000 --- 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 |