Skip to content

Commit 3432b50

Browse files
yuyichaoyuyichao
committed
[musescore-git] fix submodule and dependency override
1 parent d079915 commit 3432b50

2 files changed

Lines changed: 84 additions & 84 deletions

File tree

‎alarmcn/musescore-git/PKGBUILD‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,32 @@
33
# Maintainer: Yichao Yu <yyc1992@gmail.com>
44

55
pkgname=musescore-git
6-
_realver=2.0.4
7-
pkgver=47386.5f17e01be98
8-
pkgrel=1
6+
_realver=5.0.0
7+
pkgver=48584.4822c0fb60
8+
pkgrel=0
99
epoch=1
1010
pkgdesc="A music score editor - git-version"
1111
arch=(aarch64 i686 x86_64)
1212
url="http://www.musescore.org/en/"
1313
license=('GPL')
1414
depends=(shared-mime-info alsa-lib zlib freetype2 libvorbis libopusenc flac
1515
qt6-base qt6-networkauth qt6-declarative qt6-svg qt6-tools qt6-5compat
16-
qt6-scxml portaudio libpulse libsndfile libogg gcc-libs portmidi)
17-
makedepends=('cmake' 'doxygen' 'git' 'lame' 'xxd')
16+
qt6-scxml portaudio libpulse libsndfile libogg gcc-libs portmidi
17+
liblouis)
18+
makedepends=('cmake' 'doxygen' 'git' 'lame' 'xxd' 'vulkan-headers')
1819
optdepends=('jack')
1920
conflicts=("musescore" 'mscore' 'musescore-svn')
2021
provides=("musescore=${_realver}" 'musescore-svn')
2122
replaces=('musescore-svn')
2223
source=('git+https://github.com/musescore/MuseScore.git'
23-
'mime.xml'
24-
'0001-Do-not-force-fusion-style.patch'
25-
'0001-framework-Do-not-hard-code-Fusion-style.patch')
24+
'git+https://github.com/musescore/muse_framework.git'
25+
'git+https://github.com/musescore/muse_deps.git'
26+
'mime.xml'
27+
'0001-Do-not-force-fusion-style.patch'
28+
'0001-framework-Do-not-hard-code-Fusion-style.patch')
2629
sha256sums=('SKIP'
30+
'SKIP'
31+
'SKIP'
2732
'85304aa6d5847542a7d31c010e82abda3872c471a625b64471e4e33a0b43b39d'
2833
'53662b02251dfb275fa0abcc37816ee0a21c7a301f5ba5c71f2b3dbe139853d7'
2934
'44d320ba802b0bb731eb13d0f9393f14dbdae8c3f3a0341c4c625cfdc2d03f18')
@@ -38,32 +43,19 @@ pkgver() {
3843
prepare() {
3944
cd MuseScore
4045

46+
git submodule init
47+
48+
git config submodule.muse_framework.url "$srcdir/muse_framework"
49+
git config submodule.muse_deps.url "$srcdir/muse_deps"
50+
git -c protocol.file.allow=always submodule update
51+
4152
# Upstream add hard coded Fusion theme and they refuse to change it.
4253
patch -Np1 < ../0001-Do-not-force-fusion-style.patch
4354

4455
(
4556
cd muse
4657
patch -Np1 < ../../0001-framework-Do-not-hard-code-Fusion-style.patch
4758
)
48-
49-
(cd muse/framework/audio
50-
rm -rf thirdparty/lame/*/
51-
cat > thirdparty/lame/CMakeLists.txt <<EOF
52-
add_library(lame INTERFACE)
53-
target_link_libraries(lame INTERFACE libmp3lame.so)
54-
target_include_directories(lame INTERFACE /usr/include/lame)
55-
EOF
56-
rm -rf thirdparty/opusenc/*/
57-
echo > thirdparty/opusenc/CMakeLists.txt
58-
rm -rf thirdparty/opus/*/
59-
echo > thirdparty/opus/CMakeLists.txt
60-
rm -rf thirdparty/flac/*/
61-
cat > thirdparty/flac/CMakeLists.txt <<EOF
62-
add_library(flac INTERFACE)
63-
target_link_libraries(flac INTERFACE libFLAC.so)
64-
target_link_libraries(flac INTERFACE libFLAC++.so)
65-
EOF
66-
)
6759
}
6860

6961
build() {
@@ -84,19 +76,31 @@ build() {
8476
CFLAGS+=' -I/usr/include/opus'
8577
CXXFLAGS+=' -I/usr/include/opus'
8678
export CFLAGS
87-
export CXXFLAGS+=" -fPIC -std=gnu++11 -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unused-function -Wno-invalid-pch"
79+
export CXXFLAGS+=" -fPIC -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unused-function -Wno-invalid-pch"
8880
mkdir -p build.release
8981
cd build.release
9082
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
91-
-DCMAKE_INSTALL_PREFIX=/usr \
92-
-DCMAKE_SKIP_RPATH=On \
93-
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-fPIC" \
94-
-DBUILD_UNIT_TESTS=Off \
95-
-DBUILD_CRASHPAD_CLIENT=Off \
96-
-DMUSESCORE_BUILD_CONFIG=release \
97-
-DUSE_SYSTEM_FREETYPE=On \
98-
-DMUSESCORE_BUILD_MODE=release \
99-
-DMUE_BUILD_UNIT_TESTS=Off
83+
-DCMAKE_INSTALL_PREFIX=/usr \
84+
-DCMAKE_SKIP_RPATH=On \
85+
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-fPIC" \
86+
-DBUILD_CRASHPAD_CLIENT=Off \
87+
-DMUSESCORE_BUILD_CONFIG=release \
88+
-DMUSESCORE_BUILD_MODE=release \
89+
-DBUILD_UNIT_TESTS=Off \
90+
-DMUSE_ENABLE_UNIT_TESTS=Off \
91+
-DMUE_BUILD_UNIT_TESTS=Off \
92+
-DEXTDEPS_OVERRIDE_OGG=SYSTEM \
93+
-DEXTDEPS_OVERRIDE_VORBIS=SYSTEM \
94+
-DEXTDEPS_OVERRIDE_FLAC=SYSTEM \
95+
-DEXTDEPS_OVERRIDE_OPUS=SYSTEM \
96+
-DEXTDEPS_OVERRIDE_LIBSNDFILE=SYSTEM \
97+
-DEXTDEPS_OVERRIDE_LIBLOUIS=SYSTEM \
98+
-DEXTDEPS_OVERRIDE_ZLIB=SYSTEM \
99+
-DEXTDEPS_OVERRIDE_LIBPNG=SYSTEM \
100+
-DEXTDEPS_OVERRIDE_FREETYPE=SYSTEM \
101+
-DEXTDEPS_OVERRIDE_HARFBUZZ=SYSTEM \
102+
-DEXTDEPS_OVERRIDE_LAME=SYSTEM \
103+
-DEXTDEPS_OVERRIDE_OPUSENC=SYSTEM
100104
make
101105
}
102106

@@ -105,11 +109,7 @@ package() {
105109

106110
make DESTDIR="$pkgdir" install
107111
install -Dm644 "$srcdir/mime.xml" \
108-
"$pkgdir/usr/share/mime/packages/x-musescore.xml"
109-
# ln -s mscore "$pkgdir/usr/bin/musescore"
110-
# install -dm755 "$pkgdir/usr/share/mscore-2.0/manual"
111-
# mv share/manual/plugins/* \
112-
# "$pkgdir/usr/share/mscore-2.0/manual/plugins"
112+
"$pkgdir/usr/share/mime/packages/x-musescore.xml"
113113
rm -rf "$pkgdir/usr/include/kddockwidgets"
114114
rm -rf "$pkgdir/usr/lib/cmake/KDDockWidgets"
115115
rm -rf "$pkgdir/usr/lib/libkddockwidgets.a"

‎archlinuxcn/musescore-git/PKGBUILD‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,32 @@
33
# Maintainer: Yichao Yu <yyc1992@gmail.com>
44

55
pkgname=musescore-git
6-
_realver=2.0.4
7-
pkgver=47386.5f17e01be98
8-
pkgrel=1
6+
_realver=5.0.0
7+
pkgver=48584.4822c0fb60
8+
pkgrel=0
99
epoch=1
1010
pkgdesc="A music score editor - git-version"
1111
arch=(aarch64 i686 x86_64)
1212
url="http://www.musescore.org/en/"
1313
license=('GPL')
1414
depends=(shared-mime-info alsa-lib zlib freetype2 libvorbis libopusenc flac
1515
qt6-base qt6-networkauth qt6-declarative qt6-svg qt6-tools qt6-5compat
16-
qt6-scxml portaudio libpulse libsndfile libogg gcc-libs portmidi)
17-
makedepends=('cmake' 'doxygen' 'git' 'lame' 'xxd')
16+
qt6-scxml portaudio libpulse libsndfile libogg gcc-libs portmidi
17+
liblouis)
18+
makedepends=('cmake' 'doxygen' 'git' 'lame' 'xxd' 'vulkan-headers')
1819
optdepends=('jack')
1920
conflicts=("musescore" 'mscore' 'musescore-svn')
2021
provides=("musescore=${_realver}" 'musescore-svn')
2122
replaces=('musescore-svn')
2223
source=('git+https://github.com/musescore/MuseScore.git'
23-
'mime.xml'
24-
'0001-Do-not-force-fusion-style.patch'
25-
'0001-framework-Do-not-hard-code-Fusion-style.patch')
24+
'git+https://github.com/musescore/muse_framework.git'
25+
'git+https://github.com/musescore/muse_deps.git'
26+
'mime.xml'
27+
'0001-Do-not-force-fusion-style.patch'
28+
'0001-framework-Do-not-hard-code-Fusion-style.patch')
2629
sha256sums=('SKIP'
30+
'SKIP'
31+
'SKIP'
2732
'85304aa6d5847542a7d31c010e82abda3872c471a625b64471e4e33a0b43b39d'
2833
'53662b02251dfb275fa0abcc37816ee0a21c7a301f5ba5c71f2b3dbe139853d7'
2934
'44d320ba802b0bb731eb13d0f9393f14dbdae8c3f3a0341c4c625cfdc2d03f18')
@@ -38,32 +43,19 @@ pkgver() {
3843
prepare() {
3944
cd MuseScore
4045

46+
git submodule init
47+
48+
git config submodule.muse_framework.url "$srcdir/muse_framework"
49+
git config submodule.muse_deps.url "$srcdir/muse_deps"
50+
git -c protocol.file.allow=always submodule update
51+
4152
# Upstream add hard coded Fusion theme and they refuse to change it.
4253
patch -Np1 < ../0001-Do-not-force-fusion-style.patch
4354

4455
(
4556
cd muse
4657
patch -Np1 < ../../0001-framework-Do-not-hard-code-Fusion-style.patch
4758
)
48-
49-
(cd muse/framework/audio
50-
rm -rf thirdparty/lame/*/
51-
cat > thirdparty/lame/CMakeLists.txt <<EOF
52-
add_library(lame INTERFACE)
53-
target_link_libraries(lame INTERFACE libmp3lame.so)
54-
target_include_directories(lame INTERFACE /usr/include/lame)
55-
EOF
56-
rm -rf thirdparty/opusenc/*/
57-
echo > thirdparty/opusenc/CMakeLists.txt
58-
rm -rf thirdparty/opus/*/
59-
echo > thirdparty/opus/CMakeLists.txt
60-
rm -rf thirdparty/flac/*/
61-
cat > thirdparty/flac/CMakeLists.txt <<EOF
62-
add_library(flac INTERFACE)
63-
target_link_libraries(flac INTERFACE libFLAC.so)
64-
target_link_libraries(flac INTERFACE libFLAC++.so)
65-
EOF
66-
)
6759
}
6860

6961
build() {
@@ -84,19 +76,31 @@ build() {
8476
CFLAGS+=' -I/usr/include/opus'
8577
CXXFLAGS+=' -I/usr/include/opus'
8678
export CFLAGS
87-
export CXXFLAGS+=" -fPIC -std=gnu++11 -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unused-function -Wno-invalid-pch"
79+
export CXXFLAGS+=" -fPIC -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unused-function -Wno-invalid-pch"
8880
mkdir -p build.release
8981
cd build.release
9082
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
91-
-DCMAKE_INSTALL_PREFIX=/usr \
92-
-DCMAKE_SKIP_RPATH=On \
93-
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-fPIC" \
94-
-DBUILD_UNIT_TESTS=Off \
95-
-DBUILD_CRASHPAD_CLIENT=Off \
96-
-DMUSESCORE_BUILD_CONFIG=release \
97-
-DUSE_SYSTEM_FREETYPE=On \
98-
-DMUSESCORE_BUILD_MODE=release \
99-
-DMUE_BUILD_UNIT_TESTS=Off
83+
-DCMAKE_INSTALL_PREFIX=/usr \
84+
-DCMAKE_SKIP_RPATH=On \
85+
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-fPIC" \
86+
-DBUILD_CRASHPAD_CLIENT=Off \
87+
-DMUSESCORE_BUILD_CONFIG=release \
88+
-DMUSESCORE_BUILD_MODE=release \
89+
-DBUILD_UNIT_TESTS=Off \
90+
-DMUSE_ENABLE_UNIT_TESTS=Off \
91+
-DMUE_BUILD_UNIT_TESTS=Off \
92+
-DEXTDEPS_OVERRIDE_OGG=SYSTEM \
93+
-DEXTDEPS_OVERRIDE_VORBIS=SYSTEM \
94+
-DEXTDEPS_OVERRIDE_FLAC=SYSTEM \
95+
-DEXTDEPS_OVERRIDE_OPUS=SYSTEM \
96+
-DEXTDEPS_OVERRIDE_LIBSNDFILE=SYSTEM \
97+
-DEXTDEPS_OVERRIDE_LIBLOUIS=SYSTEM \
98+
-DEXTDEPS_OVERRIDE_ZLIB=SYSTEM \
99+
-DEXTDEPS_OVERRIDE_LIBPNG=SYSTEM \
100+
-DEXTDEPS_OVERRIDE_FREETYPE=SYSTEM \
101+
-DEXTDEPS_OVERRIDE_HARFBUZZ=SYSTEM \
102+
-DEXTDEPS_OVERRIDE_LAME=SYSTEM \
103+
-DEXTDEPS_OVERRIDE_OPUSENC=SYSTEM
100104
make
101105
}
102106

@@ -105,11 +109,7 @@ package() {
105109

106110
make DESTDIR="$pkgdir" install
107111
install -Dm644 "$srcdir/mime.xml" \
108-
"$pkgdir/usr/share/mime/packages/x-musescore.xml"
109-
# ln -s mscore "$pkgdir/usr/bin/musescore"
110-
# install -dm755 "$pkgdir/usr/share/mscore-2.0/manual"
111-
# mv share/manual/plugins/* \
112-
# "$pkgdir/usr/share/mscore-2.0/manual/plugins"
112+
"$pkgdir/usr/share/mime/packages/x-musescore.xml"
113113
rm -rf "$pkgdir/usr/include/kddockwidgets"
114114
rm -rf "$pkgdir/usr/lib/cmake/KDDockWidgets"
115115
rm -rf "$pkgdir/usr/lib/libkddockwidgets.a"

0 commit comments

Comments
 (0)