[SCM] musescore/master: Reverting mscore/CMakeLists.txt

tiago at users.alioth.debian.org tiago at users.alioth.debian.org
Mon Jun 22 22:30:05 UTC 2015


The following commit has been merged in the master branch:
commit aefce99721c2c81595c9e789bd8f8210798d01e4
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Mon Jun 22 17:39:53 2015 -0400

    Reverting mscore/CMakeLists.txt

diff --git a/debian/patches/25-build-hurd.patch b/debian/patches/25-build-hurd.patch
new file mode 100644
index 0000000..3ebbe4a
--- /dev/null
+++ b/debian/patches/25-build-hurd.patch
@@ -0,0 +1,23 @@
+# Description: Set build options for GNU/Hurd and kFreeBSD.
+# Author: Toby Smithe <tsmithe at ubuntu.com>
+
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -168,6 +168,17 @@
+             musescorefonts-Free.qrc)
+ endif (APPLE)
+ 
++if (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
++      INCLUDE (Platform/GNU)
++      set ( USE_ALSA 0 )
++      set ( USE_PORTMIDI 0 )
++endif (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
++
++if (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
++      INCLUDE (Platform/kFreeBSD)
++      set ( USE_ALSA 0 )
++      set ( USE_PORTMIDI 0 )
++endif (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
+ 
+ set (AUDIO "")
+ if (MINGW)
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
index 1644075..dbcbce0 100644
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@@ -136,17 +136,6 @@ else (APPLE)
             musescorefonts-Free.qrc)
 endif (APPLE)
 
-if (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
-      INCLUDE (Platform/GNU)
-      set ( USE_ALSA 0 )
-      set ( USE_PORTMIDI 0 )
-endif (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
-
-if (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
-      INCLUDE (Platform/kFreeBSD)
-      set ( USE_ALSA 0 )
-      set ( USE_PORTMIDI 0 )
-endif (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
 
 set (AUDIO "")
 if (MINGW)

-- 
musescore packaging



More information about the pkg-multimedia-commits mailing list