Hello community,
here is the log from the commit of package phonon-backend-gstreamer-0_10 for
openSUSE:Factory checked in at 2013-12-09 07:15:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10 (Old)
and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon-backend-gstreamer-0_10"
Changes:
--------
---
/work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10/phonon-backend-gstreamer-0_10.changes
2013-11-21 15:26:04.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new/phonon-backend-gstreamer-0_10.changes
2013-12-09 07:15:58.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Dec 6 16:45:58 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Update to version 4.7.1
+ * Bugfix release
+ * Fix gst-install-plugins i18n call
+- Dropped bnc846608-gst-install-plugins-helper-i18n-fix.patch, merged
+ upstream
+- Bump required phonon version to 4.7.1
+- Fix Source URL
+
+-------------------------------------------------------------------
Old:
----
bnc846608-gst-install-plugins-helper-i18n-fix.patch
phonon-backend-gstreamer-4.7.0.tar.xz
New:
----
phonon-backend-gstreamer-4.7.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-gstreamer-0_10.spec ++++++
--- /var/tmp/diff_new_pack.0wJdBT/_old 2013-12-09 07:15:59.000000000 +0100
+++ /var/tmp/diff_new_pack.0wJdBT/_new 2013-12-09 07:15:59.000000000 +0100
@@ -17,26 +17,24 @@
Name: phonon-backend-gstreamer-0_10
-Version: 4.7.0
+Version: 4.7.1
Release: 0
Summary: Phonon Multimedia Platform Abstraction
License: LGPL-2.0+
Group: System/GUI/KDE
Url: http://phonon.kde.org/
%define filename phonon-backend-gstreamer
-%define _phonon_version 4.7.0
-Source0:
http://download.kde.org/stable/phonon/%{filename}/%{version}/src/%{filename}-%{version}.tar.xz
+%define _phonon_version 4.7.1
+Source0:
http://download.kde.org/stable/phonon/%{filename}/%{version}/%{filename}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM 0001-Fix-no-return-in-nonvoid-function.patch -- fixes
build issue detected by post-build-checks
Patch0: 0001-Fix-no-return-in-nonvoid-function.patch
-# PATCH-FIX-UPSTREAM wen...@gmail.com -- fix bnc#846608
-Patch1: bnc846608-gst-install-plugins-helper-i18n-fix.patch
BuildRequires: alsa-devel
BuildRequires: automoc4
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: kde4-filesystem
-BuildRequires: phonon-devel >= 4.7.0
+BuildRequires: phonon-devel >= %{_phonon_version}
BuildRequires: update-desktop-files
BuildRequires: xz
Requires: libphonon4 => %{_phonon_version}
@@ -53,7 +51,6 @@
%prep
%setup -q -n %{filename}-%{version}
%patch0 -p1
-%patch1 -p1
%build
# compile everything for now, actually we should compile
++++++ phonon-backend-gstreamer-4.7.0.tar.xz ->
phonon-backend-gstreamer-4.7.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.0/CMakeLists.txt
new/phonon-backend-gstreamer-4.7.1/CMakeLists.txt
--- old/phonon-backend-gstreamer-4.7.0/CMakeLists.txt 2013-11-04
17:49:14.000000000 +0100
+++ new/phonon-backend-gstreamer-4.7.1/CMakeLists.txt 2013-12-06
11:22:51.000000000 +0100
@@ -14,7 +14,7 @@
set(PHONON_GST_MAJOR_VERSION "4")
set(PHONON_GST_MINOR_VERSION "7")
-set(PHONON_GST_PATCH_VERSION "0")
+set(PHONON_GST_PATCH_VERSION "1")
set(PHONON_GST_VERSION
"${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}")
add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.7.0/gstreamer/CMakeLists.txt
new/phonon-backend-gstreamer-4.7.1/gstreamer/CMakeLists.txt
--- old/phonon-backend-gstreamer-4.7.0/gstreamer/CMakeLists.txt 2013-11-04
17:49:14.000000000 +0100
+++ new/phonon-backend-gstreamer-4.7.1/gstreamer/CMakeLists.txt 2013-12-06
11:22:51.000000000 +0100
@@ -26,7 +26,23 @@
${GLIB2_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
${X11_X11_INCLUDE_PATH})
- add_definitions(-DPHONON_BACKEND_VERSION_4_7)
+
+ if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at
4.6.50
+ message(STATUS "Building against Phonon 4.7 API")
+ set(BACKEND_VERSION_DEFINE -DPHONON_BACKEND_VERSION_4_7)
+ elseif(${PHONON_VERSION} VERSION_GREATER "4.3.99")
+ message(STATUS "Building against Phonon 4.4 API")
+ set(BACKEND_VERSION_DEFINE -DPHONON_BACKEND_VERSION_4_4)
+ elseif(${PHONON_VERSION} VERSION_GREATER "4.1.99")
+ message(STATUS "Building against Phonon 4.2 API")
+ set(BACKEND_VERSION_DEFINE -DPHONON_BACKEND_VERSION_4_2)
+ else()
+ message(STATUS "Building against Phonon 4.0 API")
+ set(BACKEND_VERSION_DEFINE)
+ endif()
+
+ add_definitions(${BACKEND_VERSION_DEFINE})
+ set(AUTOMOC_MOC_OPTIONS ${BACKEND_VERSION_DEFINE})
# configure plugin api
if(USE_INSTALL_PLUGIN)
@@ -80,13 +96,17 @@
endif(NOT WIN32)
automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
- set_target_properties(phonon_gstreamer PROPERTIES PREFIX "")
+ set_target_properties(phonon_gstreamer PROPERTIES
+ PREFIX ""
+ AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS}
+ )
qt5_use_modules(phonon_gstreamer Core Widgets)
target_link_libraries(phonon_gstreamer
- ${PHONON_LIBRARY}
+ ${PHONON_LIBRARY}
${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY}
${GSTREAMER_INTERFACE_LIBRARY}
${GSTREAMER_PLUGIN_VIDEO_LIBRARY} ${GSTREAMER_PLUGIN_AUDIO_LIBRARY}
${GSTREAMER_PLUGIN_PBUTILS_LIBRARY}
- ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_APP_LIBRARY})
+ ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_APP_LIBRARY}
+ )
if(USE_INSTALL_PLUGIN)
target_link_libraries(phonon_gstreamer
${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES})
endif(USE_INSTALL_PLUGIN)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.7.0/gstreamer/plugininstaller.cpp
new/phonon-backend-gstreamer-4.7.1/gstreamer/plugininstaller.cpp
--- old/phonon-backend-gstreamer-4.7.0/gstreamer/plugininstaller.cpp
2013-11-04 17:49:14.000000000 +0100
+++ new/phonon-backend-gstreamer-4.7.1/gstreamer/plugininstaller.cpp
2013-12-06 11:22:51.000000000 +0100
@@ -155,7 +155,7 @@
void PluginInstaller::addPlugin(GstMessage *gstMessage)
{
gchar *details =
gst_missing_plugin_message_get_installer_detail(gstMessage);
- m_descList << details;
+ m_descList << QString::fromUtf8(details);
g_free(details);
}
@@ -170,11 +170,11 @@
gchar *details[m_pluginList.size()+m_descList.size()+1];
int i = 0;
foreach (const QString &plugin, m_pluginList.keys()) {
- details[i] =
strdup(buildInstallationString(plugin.toLocal8Bit().data(),
m_pluginList[plugin]).toLocal8Bit().data());
+ details[i] =
strdup(buildInstallationString(plugin.toUtf8().constData(),
m_pluginList[plugin]).toUtf8().constData());
i++;
}
foreach (const QString &desc, m_descList) {
- details[i] = strdup(desc.toLocal8Bit().data());
+ details[i] = strdup(desc.toUtf8().constData());
i++;
}
details[i] = 0;
@@ -251,7 +251,7 @@
return m_state;
bool allFound = true;
foreach (const QString &plugin, m_pluginList.keys()) {
- if
(!gst_default_registry_check_feature_version(plugin.toLocal8Bit().data(), 0,
10, 0)) {
+ if
(!gst_default_registry_check_feature_version(plugin.toUtf8().constData(), 0,
10, 0)) {
allFound = false;
break;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
