New commits:
commit cb9621db62886db95eb064ec4d16e9398885866b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/graphviz: version 2.40.1
commit b55563b58527d424dcfec0ba9485dcd832858f98
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/vim: version 8.0.0249
commit cbc0690da454a151e0f79ef44e4b08b8d798fa2b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/imagemagick: version 7.0.4-6
commit d101b88b4979d12822696e3b705919209a3681c5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/ed: version 1.14.1, security update
commit 2b4f0d9aad5ae075ebe116869bcdb836cb2d97a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-creation/musescore: version 2.0.3
commit 891d05297812f59d97f97545c16e82af7e7f5466
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
qt5/qttools: actually build tools
commit a33d7ce4aa9cbdccc1125c6e7d4b8283a32ae518
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/openssl: version 1.0.2k, security update
commit a3ac4ffe93b879c92bf08a95ef1464d9b9bb23c5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
doc/po4a: version 0.48
commit 3cdf84f9c663539610a6d26cf994f771d1b806d0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/text-wrapi18n: text wrapping support for i18n
commit c311645ab4839a94406773aabfe4f800551b6b44
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/unicode-linebreak: new spell, linebreak handling for unicode
commit 1ac727933a7d33ab6fe1e0efe801490d7af53de8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/mime-charset: new spell, charset information for MIME
commit eb6ca04e2261b06323801bddd5fced535890b7ae
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/harfbuzz: version 1.4.2
commit b6cf2ec9d88decef97e4d50524720301d1fcd6d0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-players/mpd: version 0.20.3
commit c11b8f3dfcdd8bd57e08771017f86d005f64138f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/vim: version 8.0.0238
commit 77af594431c3cc5d6ad09a533b19b9d444bba3e0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-libs/lilypond: version 2.18.2
commit 118bd96c7297ecfed92dd9ffdf793be3f2e68d00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/dblatex: version 0.3.9
commit fca4af09e24b28a9217a5d64c241c3848eb1c35f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
latex/texinfo: install texi2html
commit 9f56cb7e08fe03dabdb0fceb71cc6886970e07c1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/guile1: new spell, version 1.x.x of guile
commit d25a9f271cdfca48caca2ef3f89472de9a10d011
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
fonts/mftrace: version 1.2.18
commit 0ff8347e056caaea289c9db328f95f36ed6af836
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/guile: version 2.0.13
commit b2d997842d364a5ac23d85b25e9969e41ad6175b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/matplotlib: version 2.0.0
commit 7d3ba57672dc06051a1638adf09709fc7494278b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/vim: version 8.0.0217
commit 2a9d37eb1af46c9858b5deaee1014d365a3de707
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/glm: version 0.9.8.4
commit df0a896f8a4b90db4c6ad42fcc58da64b536776d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/cherrypy: version 10.0.0
commit 20e8b0c5e99d9d3f4527796c0c47c405ac6565ea
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/imagemagick: version 7.0.4-5
commit a4b4b2a695c0a9887f805fea2cef364eb1e88f23
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
FUNCTIONS: explicitly specify installation paths in cmake_build
commit 2bda18c8dc1277356c6f71c974a5b9a01ffd7f06
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/freeimage: fix CVE-2015-0852 and CVE-2016-5684
commit c4338f9eeba3010eb1a00e55be6fe604da4fb657
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11-toolkits/togl1: new spell, a Tk widget for OpenGL rendering
commit 62ee7ab681b3fa56edca23951b48259e406caea3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/simage: fix compilation against libpng >= 1.5
commit 2f24a841481a33da93ac4d53f4143f860bf389da
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/coin: use clang for building as gcc 6.3 generates broken
code
commit a0533a36ca52d6ffe516aab9997c72cb5fdd4487
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/llvm: add subdependencies for clang and lldb
commit 3116d46e27c9f0b8685d5c112d77b291cf75ceb2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/med-fichier: new spell, a library for processing MED files
commit b3ce2548ce593821d708617c59df01362e16bb2c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/gd: version 2.2.4, security update
diff --git a/ChangeLog b/ChangeLog
index b90cde7..2e82d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2017-01-26 Treeve Jelbert <treeve AT sourcemage.org>
* xorg.gpg: add 56F8CFAD "Julien Cristau
<julien.cristau AT ens-lyon.org>"
+2016-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * perl-cpan/mime-charset: new spell, charset information for MIME
+ * perl-cpan/unicode-linebreak: new spell, linebreak handling for
unicode
+ * perl-cpan/text-wrapi18n: new spell, text wrapping for i18n
+
2017-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* kde.gpg: add EC949121 "Harald Sitter <sitter.harald AT gmail.com>"
+2017-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * devel/guile1: new spell, version 1.x.x of guile
+
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11-toolkits/togl1: new spell, a Tk widget for OpenGL
+ * science/netgen: new spell, an automatic 3d tetrahedral mesh
generator
+ * FUNCTIONS: explicitly specify installation paths in cmake_build
+
+2017-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/med-fichier: new spell, a library for processing MED files
+
2017-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* security-libs/google-authenticator-libpam: new spell, a PAM module
for
two-factor authentication
diff --git a/FUNCTIONS b/FUNCTIONS
index 452fcdf..a45e9ef 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -583,6 +583,9 @@ cmake_build() {
message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
+ -DCMAKE_INSTALL_DATADIR=share \
+ -DCMAKE_INSTALL_DOCDIR=share/doc \
+ -DCMAKE_INSTALL_INCLUDEDIR=include \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_MANDIR=share/man \
-DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
diff --git a/audio-creation/musescore/01-debundle-freetype.patch
b/audio-creation/musescore/01-debundle-freetype.patch
new file mode 100644
index 0000000..c24ced5
--- /dev/null
+++ b/audio-creation/musescore/01-debundle-freetype.patch
@@ -0,0 +1,94 @@
+Description: Use the system copy of freetype
+Author: James Cowgill <jcowgill AT debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,18 +218,18 @@ SET(QT_USE_QTHELP TRUE)
+ ## freetype2 >= 2.5.2
+ ##
+
+-##if (APPLE)
+-## PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR
FREETYPE_LIBRARIES FREETYPE_CPP)
+-## if (FREETYPE_INCLUDE_DIRS)
+-## STRING(REGEX REPLACE "\"" "" FREETYPE_INCLUDE_DIRS
${FREETYPE_INCLUDE_DIRS})
+-## STRING(REGEX REPLACE "\"" "" FREETYPE_LIBDIR
${FREETYPE_LIBDIR})
+-## message("freetype2 detected ${FREETYPE_INCLUDE_DIRS}
${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
+-## else (FREETYPE_INCLUDE_DIRS)
+-## message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
+-## endif (FREETYPE_INCLUDE_DIRS)
+-##else (APPLE)
+-## find_package(Freetype REQUIRED)
+-##endif (APPLE)
++if (APPLE)
++ PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR
FREETYPE_LIBRARIES FREETYPE_CPP)
++ if (FREETYPE_INCLUDE_DIRS)
++ STRING(REGEX REPLACE "\"" "" FREETYPE_INCLUDE_DIRS
${FREETYPE_INCLUDE_DIRS})
++ STRING(REGEX REPLACE "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
++ message("freetype2 detected ${FREETYPE_INCLUDE_DIRS}
${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
++ else (FREETYPE_INCLUDE_DIRS)
++ message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
++ endif (FREETYPE_INCLUDE_DIRS)
++else (APPLE)
++ find_package(Freetype REQUIRED)
++endif (APPLE)
+
+ ##
+ ## alsa >= 1.0.0
+@@ -606,7 +606,6 @@ if (OSC)
+ subdirs (thirdparty/ofqf)
+ endif (OSC)
+
+-subdirs (thirdparty/freetype)
+
+
+ ##
+@@ -622,8 +621,7 @@ include_directories(
+ ${VORBIS_INCDIR}
+ ${SNDFILE_INCDIR}
+ ${LAME_INCLUDE_DIR}
+-# ${FREETYPE_INCLUDE_DIRS}
+- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
++ ${FREETYPE_INCLUDE_DIRS}
+ )
+
+ ##
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -385,7 +385,7 @@ if (MINGW)
+ portaudio
+ portmidi
+ winmm
+- mscore_freetype
++ freetype
+ z
+ )
+
+@@ -477,7 +477,7 @@ else (MINGW)
+ target_link_libraries(mscore
+ ${ALSA_LIB}
+ ${QT_LIBRARIES}
+- mscore_freetype
++ freetype
+ z
+ dl
+ pthread
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -17,7 +17,6 @@ enable_testing()
+ include_directories(
+ ${PROJECT_BINARY_DIR}
+ ${PROJECT_SOURCE_DIR}
+- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
+ )
+
+ if (OMR)
+@@ -108,7 +107,7 @@ add_executable(
+ target_link_libraries(
+ mtest
+ ${QT_LIBRARIES}
+- mscore_freetype
++ freetype
+ )
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
diff --git a/audio-creation/musescore/04-manpage-errors.patch
b/audio-creation/musescore/04-manpage-errors.patch
new file mode 100644
index 0000000..2e24e5f
--- /dev/null
+++ b/audio-creation/musescore/04-manpage-errors.patch
@@ -0,0 +1,27 @@
+Description: Fix errors in mscore.1 manpage
+ CMake doesn't support single quotes, so the old value of MAN_PORTABLE was
+ causing errors. Insert manual line break to help groff displaying a long
line.
+Author: James Cowgill <jcowgill AT debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,7 +478,7 @@ if (NOT MINGW AND NOT APPLE)
+ build/rm-empty-dirs DESTINATION bin
COMPONENT portable ${SCRIPT_PERMS})
+ install(FILES build/Linux+BSD/portable/qt.conf DESTINATION bin
COMPONENT portable)
+ else (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+- set(MAN_PORTABLE '.\"') # comment out lines in man page that are only
relevent to the portable version
++ set(MAN_PORTABLE .\\\") # comment out lines in man page that are only
relevent to the portable version
+ endif (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+ # install desktop file (perform variable substitution first)
+ configure_file(build/Linux+BSD/mscore.desktop.in
mscore${MSCORE_INSTALL_SUFFIX}.desktop)
+--- a/build/Linux+BSD/mscore.1.in
++++ b/build/Linux+BSD/mscore.1.in
+@@ -69,6 +69,7 @@ For help with the full MuseScore program
+ These pages cover the topics in this manual and may be more up-to-date:
+
+ <https://musescore.org/handbook/command-line-options-0>
++.br
+ <https://musescore.org/handbook/revert-factory-settings-0>
+
+ .SH OPTIONS
diff --git a/audio-creation/musescore/BUILD b/audio-creation/musescore/BUILD
index 92c81f0..af480f4 100755
--- a/audio-creation/musescore/BUILD
+++ b/audio-creation/musescore/BUILD
@@ -1,2 +1,2 @@
-PATH="$QT5DIR/bin:$PATH"
-make PREFIX="$INSTALL_ROOT/usr"
+qt5_cmake_build &&
+make lrelease
diff --git a/audio-creation/musescore/CONFIGURE
b/audio-creation/musescore/CONFIGURE
new file mode 100755
index 0000000..7eb4bb8
--- /dev/null
+++ b/audio-creation/musescore/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_option MUSESCORE_AEOLUS \
+ "Enable organ synthesizer?" n \
+ "-DAEOLUS=on" \
+ "-DAEOLUS=off" &&
+
+config_query_option MUSESCORE_ZERBERUS \
+ "Enable experimental sfz sampler?" y \
+ "-DZERBERUS=on" \
+ "-DZERBERUS=off"
diff --git a/audio-creation/musescore/DEPENDS
b/audio-creation/musescore/DEPENDS
index fd2c800..060429a 100755
--- a/audio-creation/musescore/DEPENDS
+++ b/audio-creation/musescore/DEPENDS
@@ -1,16 +1,42 @@
depends cmake &&
depends -sub CXX gcc &&
-depends alsa-lib &&
-depends portaudio19 &&
-depends lame &&
-depends libsndfile &&
+optional_depends alsa-lib \
+ "-DBUILD_ALSA=on" \
+ "-DBUILD_ALSA=off" \
+ "support for the alsa audio backend" &&
+optional_depends portaudio19 \
+ "-DBUILD_PORTAUDIO=on" \
+ "-DBUILD_PORTAUDIO=off" \
+ "support for the portaudio backend" &&
+optional_depends pulseaudio \
+ "-DBUILD_PULSEAUDIO=on" \
+ "-DBUILD_PULSEAUDIO=off" \
+ "support for the pulseaudio backend" &&
+optional_depends JACK-DRIVER \
+ "-DBUILD_JACK=on" \
+ "-DBUILD_JACK=off" \
+ "support for the jack backend" &&
+optional_depends lame \
+ "-DBUILD_LAME=on" \
+ "-DBUILD_LAME=off" \
+ "for mp3 export" &&
+optional_depends libsndfile \
+ "-DHAS_AUDIOFILE=on" \
+ "-DHAS_AUDIOFILE=off" \
+ "for audio export" &&
+optional_depends libvorbis \
+ "-DSOUNDFONT3=on" \
+ "-DSOUNDFONT3=off" \
+ "support for vorbis-compressed sound fonts" &&
+if is_depends_enabled $SPELL libvorbis; then
+ depends libogg
+fi &&
depends qtbase &&
depends qttools &&
depends qtdeclarative &&
-depends qtquick1 &&
depends qtquickcontrols &&
depends qtscript &&
depends qtxmlpatterns &&
depends qtsvg &&
depends SSL &&
-depends WEBKIT_QT
+depends WEBKIT_QT
diff --git a/audio-creation/musescore/DETAILS
b/audio-creation/musescore/DETAILS
index cee4f77..6ab33c4 100755
--- a/audio-creation/musescore/DETAILS
+++ b/audio-creation/musescore/DETAILS
@@ -1,10 +1,8 @@
SPELL=musescore
- VERSION=2.0.2
- SOURCE="MuseScore-${VERSION}.zip"
-# If you find a more canonical URL, go ahead. The website offers
-# a generic version-less link that resolves to that below (always?).
-
SOURCE_URL[0]=http://ftp.osuosl.org/pub/${SPELL}/releases/MuseScore-$VERSION/${SOURCE}
-
SOURCE_HASH=sha512:5302dd4492a86c67c142d687b2122cb59eda0dc0238cf2813c17278bbdd22d65172081576da68e7d25484158c8fea207517a1b2cec5b60a1a3c56869e62f5c19
+ VERSION=2.0.3
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]="https://github.com/musescore/MuseScore/archive/v${VERSION}.tar.gz"
+
SOURCE_HASH=sha512:4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MuseScore-${VERSION}"
WEB_SITE="https://musescore.org"
LICENSE[0]=GPLv2
diff --git a/audio-creation/musescore/HISTORY
b/audio-creation/musescore/HISTORY
index cd0e785..6e5c69e 100644
--- a/audio-creation/musescore/HISTORY
+++ b/audio-creation/musescore/HISTORY
@@ -1,3 +1,14 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.3
+ * BUILD, DEPENDS: use cmake
+ * DEPENDS: make lots of depencies optional
+ * CONFIGURE: add configuration options for synthesizers
+ * INSTALL: removed
+ * DETAILS: pull source from github
+ * PRE_BUILD, 01-debundle-freetype.patch, 04-manpage-errors.patch,
+ musescore-2.0.3-fix-buildsystem.patch: add patches from
gentoo/debian to
+ fix build errors
+
2017-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: qtwebkit => WEBKIT_QT