Hello community, here is the log from the commit of package nulloy for openSUSE:Factory checked in at 2016-02-01 19:57:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nulloy (Old) and /work/SRC/openSUSE:Factory/.nulloy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nulloy" Changes: -------- --- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes 2015-11-18 22:34:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nulloy.new/nulloy.changes 2016-02-01 19:57:50.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Jan 30 06:05:17 UTC 2016 - [email protected] + +- Updated to 0.8.1: + * Fixed phonon plugin + * Added Spanish, Ukrainian and Lithuanian translations + * Setting tags encoding + * Fixed vlc plugin + * Some other fixes and improvements +- Build phonon plugin +- Removed upstream fixed fix-upstream-desktop.patch, + fix-upstream-gstreamer-encoding-error.patch and + fix-upstream-handle-flags.patch +- Renamed fix-libsuffix.patch to fix-library-directory.patch + and rebased it. + +------------------------------------------------------------------- Old: ---- fix-libsuffix.patch fix-upstream-desktop.patch fix-upstream-gstreamer-encoding-error.patch fix-upstream-handle-flags.patch nulloy-0.8.tar.gz New: ---- fix-library-directory.patch nulloy-0.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nulloy.spec ++++++ --- /var/tmp/diff_new_pack.wjSv04/_old 2016-02-01 19:57:51.000000000 +0100 +++ /var/tmp/diff_new_pack.wjSv04/_new 2016-02-01 19:57:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nulloy # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,25 @@ Name: nulloy -Version: 0.8 +Version: 0.8.1 Release: 0 Summary: Music player with a Waveform Progress Bar License: GPL-3.0 Group: Productivity/Multimedia/Sound/Players Url: http://nulloy.com Source: https://github.com/nulloy/nulloy/releases/download/%{version}/%{name}-%{version}.tar.gz -# Fix invalid .desktop file, reported upstream -Patch0: fix-upstream-desktop.patch -# Fix problem that nulloy ignores CFLAGS, reported upstream: https://github.com/nulloy/nulloy/pull/82 -Patch1: fix-upstream-handle-flags.patch -# Fix gstreamer encoding / autosink. Issue fixed upstream in git a2fc81a -Patch2: fix-upstream-gstreamer-encoding-error.patch -Patch3: fix-libsuffix.patch +Patch0: fix-library-directory.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libqt4-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: zip +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(libvlc) +BuildRequires: pkgconfig(phonon) +BuildRequires: pkgconfig(taglib) Recommends: %{name}-gstreamer Recommends: %{name}-taglib BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,7 +47,6 @@ %package taglib Summary: Taglib plugin for %{name} Group: Productivity/Multimedia/Sound/Players -BuildRequires: pkgconfig(taglib) Requires: %{name} = %{version} %description taglib @@ -58,8 +56,6 @@ %package gstreamer Summary: Gstreamer plugin for %{name} Group: Productivity/Multimedia/Sound/Players -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) Requires: %{name} = %{version} Recommends: gstreamer-plugins-good @@ -67,25 +63,39 @@ This package contains the gstreamer playback plugin for %{name} - a lightweight music player with a Waveform Progressbar. +%package phonon +Summary: Phonon plugin for %{name} +Group: Productivity/Multimedia/Sound/Players +Requires: %{name} = %{version} + +%description phonon +This package contains the phonon playback plugin for %{name} - a lightweight +music player with a Waveform Progressbar. + +%package vlc +Summary: VLC plugin for %{name} +Group: Productivity/Multimedia/Sound/Players +Requires: %{name} = %{version} + +%description vlc +This package contains the vlc playback plugin for %{name} - a lightweight +music player with a Waveform Progressbar. + %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -CFLAGS="%{optflags}" -export CFLAGS -CXXFLAGS="%{optflags}" -export CXXFLAGS -LIBSUF=$(echo "%{_lib}" | sed 's/lib//') -# This is not a autotools configure +# This is not an autotools configure +CFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ ./configure \ --no-update-check \ --taglib \ + --phonon \ + --vlc \ --prefix %{buildroot}%{_prefix} \ - --enable-libsuffix "$LIBSUF" + --libdir "%{_lib}" make %{?_smp_mflags} @@ -119,4 +129,12 @@ %defattr(-,root,root) %{_libdir}/nulloy/plugins/libplugin_gstreamer.so +%files phonon +%defattr(-,root,root) +%{_libdir}/nulloy/plugins/libplugin_phonon.so + +%files vlc +%defattr(-,root,root) +%{_libdir}/nulloy/plugins/libplugin_vlc.so + %changelog ++++++ fix-library-directory.patch ++++++ diff -Nur old/configure new/configure --- old/configure 2015-12-06 17:17:09.000000000 +0100 +++ new/configure 2016-01-30 07:41:44.242270474 +0100 @@ -3,6 +3,7 @@ BASENAME=`basename $0` PREFIX=/usr +LIBDIR=lib DEBUG=no APP_NAME=nulloy @@ -33,6 +34,7 @@ echo ' --force-version VERSION overrides version.pri' echo ' --no-update-check disable online check functionality' echo ' --prefix PREFIX installation prefix' + echo ' --libdir LIBDIR library installation path {prefix}/{libdir}' echo ' --no-app-bundle do not make .app (Mac only)' echo ' --universal build for both i386 and x86_64 (Mac only)' echo ' --debug build in debug mode' @@ -52,7 +54,7 @@ exit 1 fi -args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix: no-app-bundle universal help" -- "$@"` +args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix: libdir: no-app-bundle universal help" -- "$@"` if test $? != 0; then echo_try; exit 1 @@ -67,6 +69,9 @@ else PREFIX=`readlink -m "$1"` fi + elif [ $1 == "--libdir" ]; then + shift + LIBDIR="$1" elif [ $1 == "--debug" ]; then DEBUG=yes elif [ $1 == "--force-version" ]; then @@ -172,6 +177,8 @@ echo "N_CONFIG_FORCE_VERSION = $FORCE_VERSION" > $QMAKE_CACHE fi +echo "N_LIBDIR = $LIBDIR" >> $QMAKE_CACHE + echo "N_CONFIG_SUCCESS = yes" >> $QMAKE_CACHE [ -z "$NULLOY_BUILD_TMP_DIR" ] && NULLOY_BUILD_TMP_DIR=`pwd`/.tmp @@ -190,7 +197,7 @@ echo echo "Running qmake..." -$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" APP_NAME="$APP_NAME" $QMAKE_EXTRA_OPTIONS +$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" LIBDIR="$LIBDIR" APP_NAME="$APP_NAME" $QMAKE_EXTRA_OPTIONS if [ $? -ne 0 ]; then echo "$BASENAME: qmake failed" exit 1 diff -Nur old/nulloy.desktop new/nulloy.desktop --- old/nulloy.desktop 2015-12-06 17:17:09.000000000 +0100 +++ new/nulloy.desktop 2016-01-30 08:07:26.494259440 +0100 @@ -1,4 +1,3 @@ - [Desktop Entry] Version=1.0 Type=Application @@ -11,7 +10,7 @@ Icon=nulloy Exec=nulloy %F -Actions=PlayPause;Stop;Next;Previous +Actions=PlayPause;Stop;Next;Previous; [Desktop Action PlayPause] Name=Play / Pause diff -Nur old/src/pluginLoader.cpp new/src/pluginLoader.cpp --- old/src/pluginLoader.cpp 2015-12-06 17:17:09.000000000 +0100 +++ new/src/pluginLoader.cpp 2016-01-30 07:45:25.356058245 +0100 @@ -107,7 +107,7 @@ pluginsDirList << NCore::rcDir() + "/" + _pluginsDirName; if (QDir(QCoreApplication::applicationDirPath()).dirName() == "bin") { QDir dir(QCoreApplication::applicationDirPath()); - dir.cd(QString() + "../lib/nulloy/" + _pluginsDirName); + dir.cd(QString() + "../" N_LIBDIR "/nulloy/" + _pluginsDirName); pluginsDirList << dir.absolutePath(); } #endif diff -Nur old/src/plugins/plugin.pri new/src/plugins/plugin.pri --- old/src/plugins/plugin.pri 2015-12-06 17:17:09.000000000 +0100 +++ new/src/plugins/plugin.pri 2016-01-30 07:34:13.190635545 +0100 @@ -17,7 +17,7 @@ mac { target.path = ../../../$${APP_NAME}.app/Contents/MacOS/plugins } else { - target.path = $$PREFIX/lib/$$APP_NAME/plugins + target.path = $$PREFIX/$$LIBDIR/$$APP_NAME/plugins } INSTALLS += target } diff -Nur old/src/src.pro new/src/src.pro --- old/src/src.pro 2015-12-06 17:17:09.000000000 +0100 +++ new/src/src.pro 2016-01-30 07:45:54.868295368 +0100 @@ -79,6 +79,7 @@ include(version.pri) DEFINES += _N_VERSION_=\""\\\"$${N_VERSION}\\\""\" +DEFINES += N_LIBDIR=\""\\\"$${N_LIBDIR}\\\""\" build_pass:CONFIG(static, static|shared) { DEFINES += _N_STATIC_BUILD_ } else { ++++++ nulloy-0.8.tar.gz -> nulloy-0.8.1.tar.gz ++++++ ++++ 4293 lines of diff (skipped)
