Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

mixxx-unstable.changes Changed

@@ -1,42 +1,36 @@
 -------------------------------------------------------------------
-Tue Nov 13 14:08:10 UTC 2018 - olaf@aepfle.de
+Wed Jun  5 13:13:17 UTC 2019 - Diego Ercolani <diego.ercolani@gmail.com>
 
-- Update to 20181110.0f5e3b9fd
+- upgraded from mixxx stable and patched python issue 
 
 -------------------------------------------------------------------
-Sat Apr 28 12:41:11 UTC 2018 - pascal.bleser@opensuse.org
+Fri May 31 16:18:55 UTC 2019 - Diego Ercolani <diego.ercolani@gmail.com>
 
-- Update to 20180427.8f1ad258a
-
-- switch to branch 2.1
-
--------------------------------------------------------------------
-Thu Apr 19 08:49:30 UTC 2018 - pascal.bleser@opensuse.org
-
-- Update to 20180418.3c4cd06e6
-
--------------------------------------------------------------------
-Sat Apr 14 17:17:30 UTC 2018 - pascal.bleser@opensuse.org
-
-- Update to 20180407.b14b2ac01
-- add qtkeychain support
-- minor build changes to try to make it more deterministic during
-  configuration stage
+- small typo in spec 
 
 -------------------------------------------------------------------
-Wed Feb  7 12:02:32 UTC 2018 - olaf@aepfle.de
+Fri May 31 16:14:30 UTC 2019 - Diego Ercolani <diego.ercolani@gmail.com>
 
-- Update to 20180204.5667a0d40 
+- upgrade mixxx to 2.2.1
+- corrected a typo in python source
+- added buildrequires for qt5 build
+- added prebuild script to create ui_*.h from *.ui files using uci-qt5 
 
 -------------------------------------------------------------------
-Tue Dec 19 09:44:28 UTC 2017 - olaf@aepfle.de
+Fri May 31 15:40:43 UTC 2019 - Diego Ercolani <diego.ercolani@gmail.com>
 
-- Update to 20171218.a1449f382
+- Upgraded mixxx version 2.2.1
+- upgraded -briefly- list of dependancies
+- corrected a typo in a python source 
+- added uic-qt5 ui_*.h generation
 
 -------------------------------------------------------------------
-Wed Aug  2 11:14:57 UTC 2017 - olaf@aepfle.de
+Sun Aug  6 08:54:25 UTC 2017 - dmitry_r@opensuse.org
 
-- Update to 20170731.5b5ba9942
+- Use original mixxx 2.0.0 tarball
+- Disable Qt5 GUI fot Tumbleweed due to bugs
+- Fix build with new chromaprint
+  * mixxx-chromaprint-1.4.patch
 
 -------------------------------------------------------------------
 Sun Mar 12 09:39:40 UTC 2017 - olaf@aepfle.de
@@ -44,739 +38,38 @@
 - Disable mp4 and faad because libmp4v2 was dropped
 
 -------------------------------------------------------------------
-Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de
-
-- Use pkgconfig for ffmpeg BuildRequires
-
--------------------------------------------------------------------
-Wed Apr  9 20:41:19 UTC 2014 - johannesobermayr@gmx.de
-
-- update to latest git master
-- remove obsolete patches
-  * mixxx-disable_qt_rpath.patch
-  * mixxx-fix_modifying_const_qstring.patch
-  * mixxx.desktop
-  * repackage.sh
-
--------------------------------------------------------------------
-Wed Aug 14 19:54:51 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 20130814120754
-
--------------------------------------------------------------------
-Sun Aug 11 11:15:55 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 20130809184906
-- add support for modplug
-
--------------------------------------------------------------------
-Sat Jun 15 19:39:51 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3430
-  * fixes bug(s): https://launchpad.net/bugs/1025007
-    Fix issue in EngineBufferScaleLinear that can cause loops to go out of
-    sync. Fixes Bug #1025007.
-  * fix vinyl input toggling not working correctly
-  * don't crash if user has a keyboard key configured for a control that doesn't exist
-
--------------------------------------------------------------------
-Wed Jun 05 14:36:47 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3412:
-  * fixes bug(s): https://launchpad.net/bugs/1185787
-    add 3/4 BPM scaling option, fixes Bug #1185787
-  * fixes bug(s): https://launchpad.net/bugs/1184324
-    Fix segfault in dlgtagfetcher see Bug #1184324
-
--------------------------------------------------------------------
-Sun May 26 20:40:40 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3404:
-  * fixes bug(s): https://launchpad.net/bugs/1184324
-    Fix segfault in dlgtagfetcher see Bug #1184324
-
-  * fixes bug(s): https://launchpad.net/bugs/1088031
-    Add new BPM context menu with for easy BPM manipulation, fix Bug #1088031
-
--------------------------------------------------------------------
-Sun May 26 01:42:20 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3403:
-  *  3403 Max Linke	2013-05-25
-      fixes bug(s): https://launchpad.net/bugs/1088031
-      Add new BPM context menu with for easy BPM manipulation, fix Bug #1088031
-
--------------------------------------------------------------------
-Thu May 23 07:22:29 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3402:
-  * fixes bug(s): https://launchpad.net/bugs/976580
-    Add horizontal scroll-bar in treeview pane
-
--------------------------------------------------------------------
-Wed May 22 14:48:09 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3397:
-  * fixes bug(s): https://launchpad.net/bugs/804700
-    merge with chromaprint branch Fix Bug #804700
-  * Only apply pre-amp gain if it is greater than 1.
-
--------------------------------------------------------------------
-Tue May 21 07:31:47 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3385
-
--------------------------------------------------------------------
-Mon May 20 12:39:40 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3380:
-  * Fix hang-on-exit deadlock in VinylControlManager. This is triggered by the
-    recent collapsing of ControlObject and ControlObjectThread.
-
--------------------------------------------------------------------
-Tue May 07 14:58:31 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3365:
-  * support mono input (just in case)
-  * bring back EnginePassthrough since we could use it for an auxiliary input
-  * version bump to 1.12.0-alpha-pre
-  * cherry-pick schema version 18 from features_key so beta testers can use it
-    without getting out of sync with whatever happens to the schema in trunk
-
--------------------------------------------------------------------
-Sun May 05 07:55:15 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3358:
-  * Get rid of VampAnalyser default max of 10-minutes! I can't believe this
-    made it past the beta. Anyone using non-fixed-tempo assumption has
-    beatgrids that are only 10-minutes long now.
-  * Also commit beatsSubVersion to the database when adding a new track. This
-    is low impact because Beats only have sub-versions if they are already
-    scanned by the library scanner and to be scanned by the library scanner
-    typically they are in the database already.
-
--------------------------------------------------------------------
-Sat May 04 11:08:34 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3357:
-  * fixes bug(s): https://launchpad.net/bugs/355945
-  * commit Vinyl Passthrough patch
-
--------------------------------------------------------------------
-Fri May 03 21:20:17 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3356:
-  * merge with bpmdelegate branch
-
--------------------------------------------------------------------
-Thu May 02 07:24:24 UTC 2013 - pascal.bleser@opensuse.org
-
-- update to 3355:
-  * Rollback of r3855. This is half-baked and should wait.
-  * Turn off keylock temporarily while controller scratching is enabled. This
-    unifies the behavior of vinyl scratching, mouse scratching, and controller
-    scratching in this respect. Fixes Bug #1174578
-
--------------------------------------------------------------------

mixxx-unstable.spec Changed

@@ -1,4 +1,8 @@
 # vim: set sw=4 ts=4 et:
+#
+# spec file for package mixxx
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010-2012 Pascal Bleser <pascal.bleser@opensuse.org>
 # Copyright (c) 2005-2010 oc2pus
 #
@@ -12,37 +16,103 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-%define mixxx_flags vinylcontrol=1 qt5=1 ffmpeg=1 flac=1 mad=1 modplug=1 opus=1 sndfile=1 faad=0 shoutcast=1 ipod=0 hid=1 bulk=1 vamp=1 wv=1 asmlib=1 qdebug=1 verbose=1 buildtime=0 localecompare=0 qtkeychain=1 qt_sqlite_plugin=1 perftools=1 optimize=portable djconsole=1 djconsole_legacy=0 hifieq=1 script=1 midiscript=1 tonal=1 portmidi=1
+%define use_qt5 1
 
 Name:           mixxx-unstable
-Summary:        Open Source DJ tool
-Version:        20181110.0f5e3b9fd
+Version:        2.3.0beta_190604
 Release:        0
+Summary:        Everything you need to perform live DJ mixes
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Players
-URL:            https://github.com/mixxxdj/mixxx
-Source0:        %{name}-%{version}.tar.xz
-Source99:       mixxx-unstable-rpmlintrc
 ExclusiveArch:  %ix86 x86_64
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  pkg-config
+Url:            http://www.mixxx.org
+#Source0:        http://downloads.mixxx.org/mixxx-%{version}/mixxx-%{version}-src.tar.gz
+Source0:	release-%{version}.tar.gz
+Source1000:     mixxx-unstable-rpmlintrc
+Patch0:         mixxx.py.patch
+Patch1:         util.py.patch
+BuildRequires:  audiofile
+BuildRequires:  fdupes
+BuildRequires:  ffmpeg-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gperftools-devel
+BuildRequires:	git
+BuildRequires:  ladspa
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libusb-devel
+BuildRequires:  liblilv-0-devel
+BuildRequires:  pkgconfig
+BuildRequires:  portmidi-devel
+BuildRequires:  qtkeychain-qt5-devel
 BuildRequires:  scons
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(soundtouch) >= 2.0.0
-BuildRequires:  libebur128-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  util-linux
+BuildRequires:  xz
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(audiofile)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(flac++)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gio-unix-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(gmodule-export-2.0)
+BuildRequires:  pkgconfig(gmodule-no-export-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(id3tag)
+BuildRequires:  pkgconfig(jack) >= 0.109
+BuildRequires:  pkgconfig(libchromaprint)
+BuildRequires:  pkgconfig(libmusicbrainz)
+BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(portaudio-2.0)
-BuildRequires:  portmidi-devel
-
+BuildRequires:  pkgconfig(protobuf)
+BuildRequires:  pkgconfig(protobuf-lite)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(python-2.7)
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(rubberband)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(shout)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(soundtouch) >= 1.3
+BuildRequires:  pkgconfig(taglib)
+BuildRequires:  pkgconfig(taglib_c)
+BuildRequires:  pkgconfig(upower-glib)
+BuildRequires:  pkgconfig(vamp)
+BuildRequires:  pkgconfig(vamp-hostsdk)
+BuildRequires:  pkgconfig(vamp-sdk)
+BuildRequires:  pkgconfig(wavpack)
+BuildRequires:  pkgconfig(zlib)
+Requires:       vamp-qm-plugins
+Recommends:     libmp3lame0
+Provides:       mixxx = %{version}-%{release}
+Conflicts:      mixxx
+Obsoletes:      %{name}-skin-hercules
+Obsoletes:      %{name}-skin-outlineClose
+Obsoletes:      %{name}-skin-outline
+Obsoletes:      %{name}-skin-outlineMini
+Obsoletes:      %{name}-skin-outlineNetbook
+Obsoletes:      %{name}-skin-nCut
+Obsoletes:      %{name}-skin-Collusion
+Obsoletes:      %{name}-skin-traditional
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  mad-devel
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(opusfile)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisenc)
+BuildRequires:  pkgconfig(vorbisfile)
+%if 0%{?use_qt5}
 BuildRequires:  libqt5-linguist
-BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Gui)
-# BuildRequires:  qtkeychain-qt5-devel
-# BuildRequires:  qtkeychain-devel
-BuildRequires:  cmake(QtKeychain)
-BuildRequires:  cmake(Qt5Keychain)
+BuildRequires:  pkgconfig(Qt5DBus) 
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5Script)
@@ -52,125 +122,147 @@
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
-
-BuildRequires:  pkgconfig(libavcodec) >= 53.35.0
-BuildRequires:  pkgconfig(libavformat) >= 53.21.0
-BuildRequires:  pkgconfig(libavutil)
-BuildRequires:  pkgconfig(sndfile)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vorbisenc)
-BuildRequires:  pkgconfig(vorbisfile)
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(freeglut)
-BuildRequires:  pkgconfig(taglib)
-BuildRequires:  pkgconfig(protobuf)
-BuildRequires:  pkgconfig(libchromaprint)
-BuildRequires:  pkgconfig(rubberband)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(id3tag)
-%if 0%{?is_opensuse}
-BuildRequires:  pkgconfig(hidapi-libusb)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
+# Mi serve uic
+BuildRequires:  libqt5-qtbase-common-devel
+%else
+BuildRequires:  pkgconfig(Qt3Support) >= 4.8
+BuildRequires:  pkgconfig(QtCLucene) >= 4.8
+BuildRequires:  pkgconfig(QtCore) >= 4.8
+BuildRequires:  pkgconfig(QtDBus) >= 4.8
+BuildRequires:  pkgconfig(QtDeclarative) >= 4.8
+BuildRequires:  pkgconfig(QtDesigner) >= 4.8
+BuildRequires:  pkgconfig(QtDesignerComponents) >= 4.8
+BuildRequires:  pkgconfig(QtGui) >= 4.8
+BuildRequires:  pkgconfig(QtHelp) >= 4.8
+BuildRequires:  pkgconfig(QtMultimedia) >= 4.8
+BuildRequires:  pkgconfig(QtNetwork) >= 4.8
+BuildRequires:  pkgconfig(QtOpenGL) >= 4.8
+BuildRequires:  pkgconfig(QtScript) >= 4.8
+BuildRequires:  pkgconfig(QtScriptTools) >= 4.8
+BuildRequires:  pkgconfig(QtSql) >= 4.8
+BuildRequires:  pkgconfig(QtSvg) >= 4.8
+BuildRequires:  pkgconfig(QtTest) >= 4.8
+BuildRequires:  pkgconfig(QtUiTools) >= 4.8
+BuildRequires:  pkgconfig(QtWebKit)
+BuildRequires:  pkgconfig(QtXml) >= 4.8
+BuildRequires:  pkgconfig(QtXmlPatterns) >= 4.8
 %endif
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(shout)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(opusfile)
-BuildRequires:  pkgconfig(wavpack)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(vamp-sdk)
-BuildRequires:  pkgconfig(fftw3)
-BuildRequires:  pkgconfig(upower-glib)
-BuildRequires:  gperftools-devel
-
-BuildRequires:  update-desktop-files
-BuildRequires:  fdupes
-BuildRequires:  alsa-devel
-
-Obsoletes:      %{name}-skin-hercules
-Obsoletes:      %{name}-skin-outlineClose

mixxx.py.patch Added

@@ -0,0 +1,24 @@
+diff -Nur mixxx-release-2.3.0beta_190604.orig/build/mixxx.py mixxx-release-2.3.0beta_190604/build/mixxx.py
+--- mixxx-release-2.3.0beta_190604.orig/build/mixxx.py	2019-06-04 12:15:59.400570394 +0200
++++ mixxx-release-2.3.0beta_190604/build/mixxx.py	2019-06-05 10:31:41.367144924 +0200
+@@ -211,15 +211,17 @@
+         import subprocess
+         process = subprocess.Popen(self.env'CC', '--version', stdout=subprocess.PIPE)
+         (stdout, stderr) = process.communicate()
+-        self.compiler_is_gcc = 'gcc' in stdout.lower()
+-        self.compiler_is_clang = 'clang' in stdout.lower()
++        print (stdout)
++        strstdout=stdout.decode('utf-8');
++        self.compiler_is_gcc = 'gcc' in strstdout.lower()
++        self.compiler_is_clang = 'clang' in strstdout.lower()
+ 
+         # Determine the major compiler version (only GCC)
+         if self.compiler_is_gcc:
+             self.gcc_major_version = None
+             process = subprocess.Popen(self.env'CC', '-dumpversion', stdout=subprocess.PIPE)
+             (stdout, stderr) = process.communicate()
+-            gcc_version = stdout
++            gcc_version = stdout.decode('utf-8')
+             # If match is None we don't know the version.
+             if not gcc_version is None:
+                 version_split = gcc_version.split('.')

_service Deleted

mixxx-unstable-20181110.0f5e3b9fd.tar.xz Deleted

mixxx-unstable-rpmlintrc Changed

release-2.3.0beta_190604.tar.gz Added