Hello community,
here is the log from the commit of package rage for openSUSE:Factory checked in at 2016-09-08 17:39:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rage (Old)
and /work/SRC/openSUSE:Factory/.rage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rage"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rage/rage.changes 2016-09-01 14:02:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rage.new/rage.changes 2016-09-08 17:39:54.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Sep 7 07:05:45 UTC 2016 - simonf.lees@suse.com
+
+- Rage 0.2.1: Fix regressions in last release (no changelog upstream)
+
+-------------------------------------------------------------------
Old:
----
rage-0.2.0.tar.xz
New:
----
rage-0.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rage.spec ++++++
--- /var/tmp/diff_new_pack.CMKLCT/_old 2016-09-08 17:39:55.000000000 +0200
+++ /var/tmp/diff_new_pack.CMKLCT/_new 2016-09-08 17:39:55.000000000 +0200
@@ -17,7 +17,7 @@
Name: rage
-Version: 0.2.0
+Version: 0.2.1
Release: 0
Summary: A mplayer like video and audio player with some extra bells and whistles
License: BSD-2-Clause
++++++ rage-0.2.0.tar.xz -> rage-0.2.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/Makefile.in new/rage-0.2.1/Makefile.in
--- old/rage-0.2.0/Makefile.in 2016-08-20 05:34:10.000000000 +0200
+++ new/rage-0.2.1/Makefile.in 2016-09-04 07:06:51.000000000 +0200
@@ -159,7 +159,7 @@
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/rage.spec.in \
$(srcdir)/rage_config.h.in $(top_srcdir)/pkgbuild/PKGBUILD.in \
AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
- install-sh ltmain.sh missing
+ depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/README new/rage-0.2.1/README
--- old/rage-0.2.0/README 2016-08-20 05:34:09.000000000 +0200
+++ new/rage-0.2.1/README 2016-09-04 07:07:21.000000000 +0200
@@ -1,4 +1,4 @@
-Rage 0.2.0
+Rage 0.2.1
******************************************************************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/configure new/rage-0.2.1/configure
--- old/rage-0.2.0/configure 2016-08-20 05:34:10.000000000 +0200
+++ new/rage-0.2.1/configure 2016-09-04 07:06:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rage 0.2.0.
+# Generated by GNU Autoconf 2.69 for rage 0.2.1.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='rage'
PACKAGE_TARNAME='rage'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='rage 0.2.0'
+PACKAGE_VERSION='0.2.1'
+PACKAGE_STRING='rage 0.2.1'
PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1278,7 +1278,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rage 0.2.0 to adapt to many kinds of systems.
+\`configure' configures rage 0.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1344,7 +1344,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rage 0.2.0:";;
+ short | recursive ) echo "Configuration of rage 0.2.1:";;
esac
cat <<\_ACEOF
@@ -1447,7 +1447,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rage configure 0.2.0
+rage configure 0.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1703,7 +1703,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rage $as_me 0.2.0, which was
+It was created by rage $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2573,7 +2573,7 @@
# Define the identity of the package.
PACKAGE='rage'
- VERSION='0.2.0'
+ VERSION='0.2.1'
cat >>confdefs.h <<_ACEOF
@@ -5767,7 +5767,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rage $as_me 0.2.0, which was
+This file was extended by rage $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5833,7 +5833,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rage config.status 0.2.0
+rage config.status 0.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/configure.ac new/rage-0.2.1/configure.ac
--- old/rage-0.2.0/configure.ac 2016-08-20 05:07:25.000000000 +0200
+++ new/rage-0.2.1/configure.ac 2016-09-04 07:06:45.000000000 +0200
@@ -1,7 +1,7 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT([rage], [0.2.0], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([rage], [0.2.1], [enlightenment-devel@lists.sourceforge.net])
AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/pkgbuild/PKGBUILD new/rage-0.2.1/pkgbuild/PKGBUILD
--- old/rage-0.2.0/pkgbuild/PKGBUILD 2016-08-20 05:34:12.000000000 +0200
+++ new/rage-0.2.1/pkgbuild/PKGBUILD 2016-09-04 07:06:53.000000000 +0200
@@ -1,6 +1,6 @@
# Maintainer: Enlightenment Developers
pkgname=rage
-pkgver=0.2.0
+pkgver=0.2.1
pkgrel=1
pkgdesc="Video player for Enlightenment - GIT development snapshot"
arch=('i686' 'x86_64' 'arm')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/rage.spec new/rage-0.2.1/rage.spec
--- old/rage-0.2.0/rage.spec 2016-08-20 05:34:11.000000000 +0200
+++ new/rage-0.2.1/rage.spec 2016-09-04 07:06:53.000000000 +0200
@@ -3,7 +3,7 @@
Summary: EFL Video Player
Name: rage
-Version: 0.2.0
+Version: 0.2.1
Release: %{_rel}
License: BSD
Group: Applications/System
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/src/bin/browser.c new/rage-0.2.1/src/bin/browser.c
--- old/rage-0.2.0/src/bin/browser.c 2016-08-20 05:34:07.000000000 +0200
+++ new/rage-0.2.1/src/bin/browser.c 2016-08-22 03:26:30.000000000 +0200
@@ -189,9 +189,19 @@
_fill_thread(void *data EINA_UNUSED, Ecore_Thread *th)
{
char buf[PATH_MAX];
- const char *vids;
+ const char *vids, *home;
+ char *vidsreal = NULL, *homereal = NULL;
vids = efreet_videos_dir_get();
+ if (vids) vidsreal = ecore_file_realpath(vids);
+ home = eina_environment_home_get();
+ if (home) homereal = ecore_file_realpath(home);
+ if ((vidsreal) && (homereal))
+ {
+ if (!strcmp(vidsreal, homereal)) vids = NULL;
+ }
+ free(vidsreal);
+ free(homereal);
if (vids)
snprintf(buf, sizeof(buf), "%s", vids);
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/src/bin/thumb.c new/rage-0.2.1/src/bin/thumb.c
--- old/rage-0.2.0/src/bin/thumb.c 2016-08-20 05:24:57.000000000 +0200
+++ new/rage-0.2.1/src/bin/thumb.c 2016-08-22 16:07:28.000000000 +0200
@@ -50,7 +50,7 @@
if (is_audio)
{
- albumart_find(file, title, artist, album, NULL,
+ albumart_find(file, artist, album, title, NULL,
_cb_fetched, (void *)file);
return;
}
@@ -72,7 +72,7 @@
if (is_movie)
{
- albumart_find(file, NULL, NULL, NULL, "film poster",
+ albumart_find(file, NULL, NULL, title, "film poster",
_cb_fetched, (void *)file);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rage-0.2.0/src/bin/videothumb.c new/rage-0.2.1/src/bin/videothumb.c
--- old/rage-0.2.0/src/bin/videothumb.c 2016-08-15 00:55:47.000000000 +0200
+++ new/rage-0.2.1/src/bin/videothumb.c 2016-08-22 02:53:17.000000000 +0200
@@ -144,7 +144,7 @@
sd->exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_cb_thumb_exe, obj);
snprintf(buf, sizeof(buf),
- "%s/rage/utils/rage_thumb %s 10000 %i 2>&1 /dev/null",
+ "%s/rage/utils/rage_thumb %s 10000 %i 1> /dev/null 2>&1",
libdir, s, sd->poster_mode ? 1 : 0);
sd->thumb_exe = ecore_exe_pipe_run(buf,
ECORE_EXE_USE_SH |
@@ -160,6 +160,25 @@
}
static Eina_Bool
+_have_active_thumb(const char *path)
+{
+ Evas_Object *o;
+ Eina_List *l;
+
+ EINA_LIST_FOREACH(vidthumbs, l, o)
+ {
+ Videothumb *sd = evas_object_smart_data_get(o);
+
+ if (sd)
+ {
+ if ((sd->thumb_exe) && (!strcmp(path, sd->realpath)))
+ return EINA_TRUE;
+ }
+ }
+ return EINA_FALSE;
+}
+
+static Eina_Bool
_cb_videothumb_delay(void *data)
{
Evas_Object *obj = data;
@@ -168,8 +187,16 @@
if (!sd) return EINA_FALSE;
if (_thumb_running < maxnum)
{
+ if (!_have_active_thumb(sd->realpath))
+ {
+ sd->launch_timer = NULL;
+ _videothumb_launch_do(obj);
+ return EINA_FALSE;
+ }
+ }
+ if ((sd->iw > 0) && (sd->ih > 0))
+ {
sd->launch_timer = NULL;
- _videothumb_launch_do(obj);
return EINA_FALSE;
}
return EINA_TRUE;
@@ -182,7 +209,7 @@
if (!sd) return;
if (sd->launch_timer) return;
- sd->launch_timer = ecore_timer_add(1.0, _cb_videothumb_delay, obj);
+ sd->launch_timer = ecore_timer_add(0.5, _cb_videothumb_delay, obj);
}
static Eina_Bool
