Merge branch 'master' of https://github.com/mixxxdj/mixxx

build/debian/control

@@ -17,13 +17,11 @@ Build-Depends: debhelper (>= 4.0.0),
                libsndfile1-dev,
                libasound2-dev,
                libvorbis-dev,
-               libsoundtouch1-dev,
                libmp4v2-dev,
                libfaad-dev,
                libportmidi-dev,
                libtag1-dev,
                libshout-dev,
-               libqtwebkit-dev,
                vamp-plugin-sdk,
                libprotobuf-dev,
                protobuf-compiler,
@@ -46,7 +44,6 @@ Depends: ${shlibs:Depends},
          libqt4-opengl,
          libqt4-svg,
          libqt4-xmlpatterns,
-         libqt4-webkit,
          libqt4-sql,
          libqt4-sql-sqlite
 Recommends: libmp3lame0

build/debian/rules

@@ -12,23 +12,17 @@
 # no thanks dpkg-buildpackage, we will handle our own C++ optimizations
 DEB_BUILD_OPTIONS= noopt
 
-# optimize=portable
-# for sse2 CPUs (>= Pentium 4) which is the minimum requiremnt for using Mixxx
-# this will set CCFLAGS=-mtune=generic -msse2 -mfpmath=sse
-# If you need a pure i386 code which is the Debian standard use
-# optimize=legacy (not recomended)
-# this sets CCFLAGS=-mtune=generic only
-# virtualize=0 switches of keeping build files in the cache folder
-MIXXX_SCONS_FLAGS = optimize=portable virtualize=0 mad=1 localecompare=1 qt_sqlite_plugin=0 build=$(MIXXX_BUILD)
+# Build flags are passed in from the SConscript.
+MIXXX_SCONS_FLAGS = ""
 
 # If ARCH is set to a different architecture when running pbuilder, pbuilder
 # will be set to create an environment to build packages for the architecture
 # specified in ARCH.
 ifneq (,$(findstring i386,$(ARCH)))
-	MIXXX_SCONS_FLAGS += machine=x86
+       MIXXX_SCONS_FLAGS += machine=x86
 endif
 ifneq (,$(findstring amd64,$(ARCH)))
-	MIXXX_SCONS_FLAGS += machine=x86_64
+       MIXXX_SCONS_FLAGS += machine=x86_64
 endif
 
 # detect number of processors
@@ -109,7 +103,6 @@ binary-arch: build install
 	dh_installudev --name=mixxx-usb
 #	dh_install
 	dh_installmenu
-	dh_desktop
 #	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen

build/osx/product_definition.plist

@@ -9,7 +9,7 @@
 	</array>
 	<key>os</key>
 	<array>
-		<string>10.5.0</string>
+		<string>10.7.0</string>
 	</array>
 </dict>
 </plist>