Re: UPDATE: audio/mscore to 3.0.0

2019-01-13 Thread Brian Callahan




On 1/11/19 6:23 PM, Sebastian Reitenbach wrote:

Hi Brian,
  
Am Freitag, Januar 11, 2019 23:14 CET, Brian Callahan  schrieb:
  

Hi Sebastian --

On 1/10/19 8:26 AM, Sebastian Reitenbach wrote:

Find attached and inline an update of Musescore to 3.0.0.
See the release notes for changes: 
https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3
Also you may find this mentioning remarks/bugs/issues with the Musescore 3 
version:
https://musescore.org/en/handbook/developers-handbook/references/musescore-roadmap/remarks-musescore3-bugs-issues
Most notably thereof the last point under the TODOs, mentioning the
dependency to QtWebEngine for the MuseScore connect window.
QtWebEngine is not yet ported to OpenBSD, so I disabled that
for the time being.

Also in the ports Makefile, I introduced the MAJ_MIN variable, thats then used
in the PLIST to (hopefully) prevent further huge diffs in the future once they
bump major or minor version again.

Other than that, It happily imported and converted my few scores from the older 
version, played
them etc.


tested on amd64.


any comments, reports, or even OKs welcome.

Thanks for this; it was on my TODO list, somewhere on the list of a
million other things :)
One thought: could we take those BUILD_*+=ON/OFF patches out and just
put them in CONFIGURE_ARGS like we do everything else?


indeed, so how about this then (still building for me):


I'm good with this. Thanks.

~Brian




Index: Makefile
===
RCS file: /cvs/ports/audio/mscore/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile2 Sep 2018 23:16:28 -   1.36
+++ Makefile11 Jan 2019 23:18:38 -
@@ -2,7 +2,7 @@
  
  BROKEN-hppa =	ICE on moc_qtsingleapplication.cxx
  
-V =		2.3.2

+V =3.0.0
  COMMENT = WYSIWYG music notation software (MuseScore)
  DISTNAME =MuseScore-${V}
  PKGNAME = musescore-${V}
@@ -15,9 +15,9 @@
  # GPLv2 only
  PERMIT_PACKAGE_CDROM =Yes
  
-WANTLIB += Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5Help Qt5Network

+WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Help Qt5Network
  WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5Widgets
  WANTLIB += Qt5Xml Qt5XmlPatterns c freetype m ogg portaudio pthread
  WANTLIB += sndfile vorbis vorbisfile z
  WANTLIB += ${COMPILER_LIBCXX}
@@ -35,7 +35,6 @@
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
-   x11/qt5/qtwebkit \
x11/qt5/qtxmlpatterns
  
  RUN_DEPENDS =	devel/desktop-file-utils \

@@ -48,9 +47,13 @@
-DBUILD_JACK=OFF \
-DBUILD_PORTMIDI=OFF \
-DBUILD_PULSEAUDIO=OFF \
+   -DBUILD_PCH=OFF \
+   -DBUILD_WEBENGINE=OFF \
-DUSE_SYSTEM_FREETYPE=ON
  
  NO_TEST =	Yes

+MAJ_MIN =  ${V:C/^([0-9]+\.[0-9]+).*/\1/}
+SUBST_VARS +=  MAJ_MIN
  
  # Bad zip file...

  WRKDIST = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/audio/mscore/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo2 Sep 2018 23:16:28 -   1.8
+++ distinfo11 Jan 2019 23:18:38 -
@@ -1,2 +1,2 @@
-SHA256 (MuseScore-2.3.2.zip) = W/RKmC6Y8xYIyFsO0JxQ1+TwGi+sxbXm8HLnF0wr2vg=
-SIZE (MuseScore-2.3.2.zip) = 78629900
+SHA256 (MuseScore-3.0.0.zip) = inZKH4kRUCy5iHyEzeSo3aGTp2Yze45HfokYXL83IsY=
+SIZE (MuseScore-3.0.0.zip) = 116183004
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/audio/mscore/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt25 Apr 2018 19:11:03 -  1.5
+++ patches/patch-CMakeLists_txt11 Jan 2019 23:18:38 -
@@ -2,89 +2,109 @@
  Index: CMakeLists.txt
  --- CMakeLists.txt.orig
  +++ CMakeLists.txt
-@@ -170,7 +170,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+@@ -208,7 +208,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
   
- set(CMAKE_CXX_FLAGS_DEBUG   "-g")

--set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ if (NOT MSVC)
+set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ endif (NOT MSVC)
   
   if (APPLE)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ 
-Wno-inconsistent-missing-override")
-@@ -328,13 +328,13 @@ endif (BUILD_ALSA)
+@@ -384,13 +384,13 @@ endif (BUILD_ALSA)
   ## MIDI
   ##
   
--if (APPLE OR MINGW)

-+if (APPLE OR MINGW OR UNIX)
+-if (APPLE OR MINGW OR MSVC)
++

Re: UPDATE: audio/mscore to 3.0.0

2019-01-11 Thread Sebastian Reitenbach
Hi Brian,

Am Freitag, Januar 11, 2019 23:14 CET, Brian Callahan  
schrieb:

> Hi Sebastian --
>
> On 1/10/19 8:26 AM, Sebastian Reitenbach wrote:
> > Find attached and inline an update of Musescore to 3.0.0.
> > See the release notes for changes: 
> > https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3
> > Also you may find this mentioning remarks/bugs/issues with the Musescore 3 
> > version:
> > https://musescore.org/en/handbook/developers-handbook/references/musescore-roadmap/remarks-musescore3-bugs-issues
> > Most notably thereof the last point under the TODOs, mentioning the
> > dependency to QtWebEngine for the MuseScore connect window.
> > QtWebEngine is not yet ported to OpenBSD, so I disabled that
> > for the time being.
> >
> > Also in the ports Makefile, I introduced the MAJ_MIN variable, thats then 
> > used
> > in the PLIST to (hopefully) prevent further huge diffs in the future once 
> > they
> > bump major or minor version again.
> >
> > Other than that, It happily imported and converted my few scores from the 
> > older version, played
> > them etc.
> >
> >
> > tested on amd64.
> >
> >
> > any comments, reports, or even OKs welcome.
>
> Thanks for this; it was on my TODO list, somewhere on the list of a
> million other things :)
> One thought: could we take those BUILD_*+=ON/OFF patches out and just
> put them in CONFIGURE_ARGS like we do everything else?
>

indeed, so how about this then (still building for me):



Index: Makefile
===
RCS file: /cvs/ports/audio/mscore/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile2 Sep 2018 23:16:28 -   1.36
+++ Makefile11 Jan 2019 23:18:38 -
@@ -2,7 +2,7 @@

 BROKEN-hppa =  ICE on moc_qtsingleapplication.cxx

-V =2.3.2
+V =3.0.0
 COMMENT =  WYSIWYG music notation software (MuseScore)
 DISTNAME = MuseScore-${V}
 PKGNAME =  musescore-${V}
@@ -15,9 +15,9 @@
 # GPLv2 only
 PERMIT_PACKAGE_CDROM = Yes

-WANTLIB += Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5Help Qt5Network
+WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Help Qt5Network
 WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5Widgets
 WANTLIB += Qt5Xml Qt5XmlPatterns c freetype m ogg portaudio pthread
 WANTLIB += sndfile vorbis vorbisfile z
 WANTLIB += ${COMPILER_LIBCXX}
@@ -35,7 +35,6 @@
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
-   x11/qt5/qtwebkit \
x11/qt5/qtxmlpatterns

 RUN_DEPENDS =  devel/desktop-file-utils \
@@ -48,9 +47,13 @@
-DBUILD_JACK=OFF \
-DBUILD_PORTMIDI=OFF \
-DBUILD_PULSEAUDIO=OFF \
+   -DBUILD_PCH=OFF \
+   -DBUILD_WEBENGINE=OFF \
-DUSE_SYSTEM_FREETYPE=ON

 NO_TEST =  Yes
+MAJ_MIN =  ${V:C/^([0-9]+\.[0-9]+).*/\1/}
+SUBST_VARS +=  MAJ_MIN

 # Bad zip file...
 WRKDIST =  ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/audio/mscore/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo2 Sep 2018 23:16:28 -   1.8
+++ distinfo11 Jan 2019 23:18:38 -
@@ -1,2 +1,2 @@
-SHA256 (MuseScore-2.3.2.zip) = W/RKmC6Y8xYIyFsO0JxQ1+TwGi+sxbXm8HLnF0wr2vg=
-SIZE (MuseScore-2.3.2.zip) = 78629900
+SHA256 (MuseScore-3.0.0.zip) = inZKH4kRUCy5iHyEzeSo3aGTp2Yze45HfokYXL83IsY=
+SIZE (MuseScore-3.0.0.zip) = 116183004
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/audio/mscore/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt25 Apr 2018 19:11:03 -  1.5
+++ patches/patch-CMakeLists_txt11 Jan 2019 23:18:38 -
@@ -2,89 +2,109 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -170,7 +170,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+@@ -208,7 +208,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")

- set(CMAKE_CXX_FLAGS_DEBUG   "-g")
--set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ if (NOT MSVC)
+set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ endif (NOT MSVC)

  if (APPLE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ 
-Wno-inconsistent-missing-override")
-@@ -328,13 +328,13 @@ endif (BUILD_ALSA)
+@@ -384,13 +384,13 @@ endif (BUILD_ALSA)
  ## MIDI
  ##

--if (APPLE OR MINGW)
-+if (APPLE OR MINGW OR UNIX)
+-if (APPLE OR MINGW OR MSVC)
++if (APPLE OR MING

Re: UPDATE: audio/mscore to 3.0.0

2019-01-11 Thread Brian Callahan

Hi Sebastian --

On 1/10/19 8:26 AM, Sebastian Reitenbach wrote:

Find attached and inline an update of Musescore to 3.0.0.
See the release notes for changes: 
https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3
Also you may find this mentioning remarks/bugs/issues with the Musescore 3 
version:
https://musescore.org/en/handbook/developers-handbook/references/musescore-roadmap/remarks-musescore3-bugs-issues
Most notably thereof the last point under the TODOs, mentioning the
dependency to QtWebEngine for the MuseScore connect window.
QtWebEngine is not yet ported to OpenBSD, so I disabled that
for the time being.

Also in the ports Makefile, I introduced the MAJ_MIN variable, thats then used
in the PLIST to (hopefully) prevent further huge diffs in the future once they
bump major or minor version again.

Other than that, It happily imported and converted my few scores from the older 
version, played
them etc.


tested on amd64.


any comments, reports, or even OKs welcome.


Thanks for this; it was on my TODO list, somewhere on the list of a 
million other things :)
One thought: could we take those BUILD_*+=ON/OFF patches out and just 
put them in CONFIGURE_ARGS like we do everything else?


I'll test some time tomorrow.

~Brian


cheers,
Sebastian




Index: Makefile
===
RCS file: /cvs/ports/audio/mscore/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile2 Sep 2018 23:16:28 -   1.36
+++ Makefile10 Jan 2019 13:14:53 -
@@ -2,7 +2,7 @@
  
  BROKEN-hppa =	ICE on moc_qtsingleapplication.cxx
  
-V =		2.3.2

+V =3.0.0
  COMMENT = WYSIWYG music notation software (MuseScore)
  DISTNAME =MuseScore-${V}
  PKGNAME = musescore-${V}
@@ -15,9 +15,9 @@
  # GPLv2 only
  PERMIT_PACKAGE_CDROM =Yes
  
-WANTLIB += Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5Help Qt5Network

+WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Help Qt5Network
  WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5Widgets
  WANTLIB += Qt5Xml Qt5XmlPatterns c freetype m ogg portaudio pthread
  WANTLIB += sndfile vorbis vorbisfile z
  WANTLIB += ${COMPILER_LIBCXX}
@@ -35,7 +35,6 @@
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
-   x11/qt5/qtwebkit \
x11/qt5/qtxmlpatterns
  
  RUN_DEPENDS =	devel/desktop-file-utils \

@@ -51,6 +50,8 @@
-DUSE_SYSTEM_FREETYPE=ON
  
  NO_TEST =	Yes

+MAJ_MIN =  ${V:C/^([0-9]+\.[0-9]+).*/\1/}
+SUBST_VARS +=  MAJ_MIN
  
  # Bad zip file...

  WRKDIST = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/audio/mscore/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo2 Sep 2018 23:16:28 -   1.8
+++ distinfo10 Jan 2019 13:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (MuseScore-2.3.2.zip) = W/RKmC6Y8xYIyFsO0JxQ1+TwGi+sxbXm8HLnF0wr2vg=
-SIZE (MuseScore-2.3.2.zip) = 78629900
+SHA256 (MuseScore-3.0.0.zip) = inZKH4kRUCy5iHyEzeSo3aGTp2Yze45HfokYXL83IsY=
+SIZE (MuseScore-3.0.0.zip) = 116183004
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/audio/mscore/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt25 Apr 2018 19:11:03 -  1.5
+++ patches/patch-CMakeLists_txt10 Jan 2019 13:14:53 -
@@ -2,89 +2,120 @@
  Index: CMakeLists.txt
  --- CMakeLists.txt.orig
  +++ CMakeLists.txt
-@@ -170,7 +170,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
- set(CMAKE_CXX_FLAGS_DEBUG   "-g")
--set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+@@ -124,8 +124,8 @@ option(BUILD_PULSEAUDIO "Build with support for PulseA
+ option(BUILD_ALSA "Build with support for ALSA audio backend." ON)
+ option(BUILD_PORTAUDIO "Build with support for PortAudio audio backend." ON)
+ option(BUILD_PORTMIDI "Build with support for PortAudio's MIDI features." 
${BUILD_PORTAUDIO}) # PortAudio required
+-option(BUILD_WEBENGINE "Built in webengine support" ON)
+-option(BUILD_PCH "Build using precompiled headers." ON)
++option(BUILD_WEBENGINE "Built in webengine support" OFF)
++option(BUILD_PCH "Build using precompiled headers." OFF)
+ option(BUILD_FOR_WINSTORE "Build for the Windows Store." OFF)
+ option(COVERAGE "Build with instrumentation to record code coverage." OFF)
+ option(BUILD_64 "Build 64 bit version of editor" ON)
+@@ -208,7 +208,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+
+ if (NOT MSVC)
+set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQ

UPDATE: audio/mscore to 3.0.0

2019-01-10 Thread Sebastian Reitenbach
Find attached and inline an update of Musescore to 3.0.0.
See the release notes for changes: 
https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3
Also you may find this mentioning remarks/bugs/issues with the Musescore 3 
version:
https://musescore.org/en/handbook/developers-handbook/references/musescore-roadmap/remarks-musescore3-bugs-issues
Most notably thereof the last point under the TODOs, mentioning the
dependency to QtWebEngine for the MuseScore connect window.
QtWebEngine is not yet ported to OpenBSD, so I disabled that
for the time being.

Also in the ports Makefile, I introduced the MAJ_MIN variable, thats then used
in the PLIST to (hopefully) prevent further huge diffs in the future once they
bump major or minor version again.

Other than that, It happily imported and converted my few scores from the older 
version, played
them etc.


tested on amd64.


any comments, reports, or even OKs welcome.

cheers,
Sebastian




Index: Makefile
===
RCS file: /cvs/ports/audio/mscore/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile2 Sep 2018 23:16:28 -   1.36
+++ Makefile10 Jan 2019 13:14:53 -
@@ -2,7 +2,7 @@

 BROKEN-hppa =  ICE on moc_qtsingleapplication.cxx

-V =2.3.2
+V =3.0.0
 COMMENT =  WYSIWYG music notation software (MuseScore)
 DISTNAME = MuseScore-${V}
 PKGNAME =  musescore-${V}
@@ -15,9 +15,9 @@
 # GPLv2 only
 PERMIT_PACKAGE_CDROM = Yes

-WANTLIB += Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5Help Qt5Network
+WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Help Qt5Network
 WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5Widgets
 WANTLIB += Qt5Xml Qt5XmlPatterns c freetype m ogg portaudio pthread
 WANTLIB += sndfile vorbis vorbisfile z
 WANTLIB += ${COMPILER_LIBCXX}
@@ -35,7 +35,6 @@
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
-   x11/qt5/qtwebkit \
x11/qt5/qtxmlpatterns

 RUN_DEPENDS =  devel/desktop-file-utils \
@@ -51,6 +50,8 @@
-DUSE_SYSTEM_FREETYPE=ON

 NO_TEST =  Yes
+MAJ_MIN =  ${V:C/^([0-9]+\.[0-9]+).*/\1/}
+SUBST_VARS +=  MAJ_MIN

 # Bad zip file...
 WRKDIST =  ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/audio/mscore/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo2 Sep 2018 23:16:28 -   1.8
+++ distinfo10 Jan 2019 13:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (MuseScore-2.3.2.zip) = W/RKmC6Y8xYIyFsO0JxQ1+TwGi+sxbXm8HLnF0wr2vg=
-SIZE (MuseScore-2.3.2.zip) = 78629900
+SHA256 (MuseScore-3.0.0.zip) = inZKH4kRUCy5iHyEzeSo3aGTp2Yze45HfokYXL83IsY=
+SIZE (MuseScore-3.0.0.zip) = 116183004
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/audio/mscore/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt25 Apr 2018 19:11:03 -  1.5
+++ patches/patch-CMakeLists_txt10 Jan 2019 13:14:53 -
@@ -2,89 +2,120 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -170,7 +170,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
- set(CMAKE_CXX_FLAGS_DEBUG   "-g")
--set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+@@ -124,8 +124,8 @@ option(BUILD_PULSEAUDIO "Build with support for PulseA
+ option(BUILD_ALSA "Build with support for ALSA audio backend." ON)
+ option(BUILD_PORTAUDIO "Build with support for PortAudio audio backend." ON)
+ option(BUILD_PORTMIDI "Build with support for PortAudio's MIDI features." 
${BUILD_PORTAUDIO}) # PortAudio required
+-option(BUILD_WEBENGINE "Built in webengine support" ON)
+-option(BUILD_PCH "Build using precompiled headers." ON)
++option(BUILD_WEBENGINE "Built in webengine support" OFF)
++option(BUILD_PCH "Build using precompiled headers." OFF)
+ option(BUILD_FOR_WINSTORE "Build for the Windows Store." OFF)
+ option(COVERAGE "Build with instrumentation to record code coverage." OFF)
+ option(BUILD_64 "Build 64 bit version of editor" ON)
+@@ -208,7 +208,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+
+ if (NOT MSVC)
+set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ endif (NOT MSVC)

  if (APPLE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ 
-Wno-inconsistent-missing-override")
-@@ -328,13 +328,13 @@ endif (BUILD_ALSA)
+@@ -384,13 +384,13 @@ endif (BUILD_ALSA)
  ## MIDI
  ##

--if (APPLE OR MINGW)
-+if (A