Diff zynaddsubfx-3.0.6-r6 with a zynaddsubfx-3.0.6-r8

/usr/portage/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r8.ebuild 2026-07-11 20:03:06.090340730 +0300
12 12
	https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2
13 13
	https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2
14 14
"
15
S_ZYN_FUSION_UI="${WORKDIR}"/zyn-fusion-ui-src-${PV}
15 16

  
16 17
LICENSE="GPL-2"
17 18
SLOT="0"
......
20 21
REQUIRED_USE="|| ( alsa jack portaudio )"
21 22

  
22 23
DEPEND="
23
	dev-libs/mxml:0
24
	dev-libs/mxml:4
24 25
	media-libs/liblo
25 26
	sci-libs/fftw:3.0
26 27
	virtual/zlib:=
......
39 40
BDEPEND="
40 41
	dev-lang/ruby:*
41 42
	virtual/pkgconfig
42
	doc? ( app-text/doxygen )
43
	doc? ( app-text/doxygen[dot] )
43 44
"
44 45

  
45 46
PATCHES=(
46 47
	"${FILESDIR}"/${P}-docs.patch
47 48
	"${FILESDIR}"/${P}-stdint.patch
48 49
	"${FILESDIR}"/${P}-libzest_location.patch
50
	"${FILESDIR}"/${P}-cmake4.patch # bug 957633, in git master
51
	"${FILESDIR}"/${P}-mxml4.patch # bug 930526, in git master
49 52
)
50 53
ZYN_FUSION_UI_PATCHES=(
51 54
	"${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch
......
57 60
DOCS=( AUTHORS.txt NEWS.txt README.adoc )
58 61

  
59 62
src_prepare() {
63
	pushd DPF > /dev/null || die
64
		eapply "${FILESDIR}"/${P}-DPF-cmake4.patch # bug 957633, in git master
65
	popd > /dev/null || die
66

  
67
	pushd rtosc > /dev/null || die
68
		eapply "${FILESDIR}"/${P}-rtosc-cmake4.patch # bug 957633, in git master
69
		eapply "${FILESDIR}"/${P}-fix-Wnonnull-warning.patch # in git master
70
	popd > /dev/null || die
71

  
72
	pushd "${S_ZYN_FUSION_UI}" > /dev/null || die
73
		eapply "${ZYN_FUSION_UI_PATCHES[@]}"
74
	popd > /dev/null || die
75

  
60 76
	cmake_src_prepare
61 77

  
62 78
	if ! use dssi; then
......
73 89
	fi
74 90

  
75 91
	# FIXME upstream: sandbox error
76
	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
77

  
78
	cd ../zyn-fusion-ui-src-${PV}
79
	eapply "${ZYN_FUSION_UI_PATCHES[@]}"
92
	cmake_comment_add_subdirectory -f doc bash-completion
80 93

  
81 94
	sed -i "s|@GENTOO_LIBDIR@|$(get_libdir)|" \
82
		"${S}/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" \
83
		test-libversion.c || die
95
		src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \
96
		"${S_ZYN_FUSION_UI}"/test-libversion.c || die
84 97

  
85 98
	eprefixify \
86
		"${S}/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" \
87
		test-libversion.c
99
		src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \
100
		"${S_ZYN_FUSION_UI}"/test-libversion.c
88 101
}
89 102

  
90 103
src_configure() {
......
106 119
	use doc && cmake_src_compile doc
107 120
	emake \
108 121
		LD="$(tc-getCC)" \
109
		-C ../zyn-fusion-ui-src-${PV}
122
		-C "${S_ZYN_FUSION_UI}"
110 123
}
111 124

  
112 125
src_install() {
113 126
	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
114 127
	cmake_src_install
115 128

  
116
	cd ../zyn-fusion-ui-src-${PV}
117
	newbin zest zyn-fusion
118
	insinto /usr/$(get_libdir)/${PN}
119
	doins libzest.so
120
	insinto /usr/share/${PN}/qml
121
	doins -r src/mruby-zest/{example,qml}/*.qml
122
	insinto /usr/share/${PN}/schema
123
	doins src/osc-bridge/schema/test.json
129
	pushd "${S_ZYN_FUSION_UI}" > /dev/null || die
130
		newbin zest zyn-fusion
131
		insinto /usr/$(get_libdir)/${PN}
132
		doins libzest.so
133
		insinto /usr/share/${PN}/qml
134
		doins -r src/mruby-zest/{example,qml}/*.qml
135
		insinto /usr/share/${PN}/schema
136
		doins src/osc-bridge/schema/test.json
137
	popd > /dev/null || die
124 138
}
Thank you!