diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2013-11-04 17:08:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:57:36 +0200 |
commit | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch) | |
tree | 9b98e6e193c7870cb27ac861394c1c4592850922 /source/xap/xine-ui | |
parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
download | current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz |
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!
It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout 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.patch | 27 | ||||
-rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 6 | ||||
-rw-r--r-- | source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff | 11 |
3 files changed, 30 insertions, 14 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 new file mode 100644 index 00000000..448c9d3e --- /dev/null +++ b/source/xap/xine-ui/xine-ui-0.99.7-upstream_fix-1.patch @@ -0,0 +1,27 @@ +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 65a18c18..228936c0 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -57,7 +57,7 @@ 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.no.deprecated.curl.headers.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/xine-ui-0.99.7-upstream_fix-1.patch.gz | patch -p1 --verbose || exit 1 XINE_BUILD=$TARGET \ ./configure \ @@ -66,7 +66,7 @@ XINE_BUILD=$TARGET \ --with-caca \ --disable-lirc \ --mandir=/usr/man \ - --build=$TARGET + --build=$TARGET || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff deleted file mode 100644 index 63e57717..00000000 --- a/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/xitk/download.c.orig 2009-12-18 18:34:22.000000000 -0600 -+++ ./src/xitk/download.c 2012-09-09 12:47:15.757552304 -0500 -@@ -28,8 +28,6 @@ - - #ifdef HAVE_CURL - #include <curl/curl.h> --#include <curl/types.h> --#include <curl/easy.h> - #endif - - #include "common.h" |