Skip to content

Commit 54a87e3

Browse files
g-maximeg-maxime
committed
Update Linux packageing scripts
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
1 parent 7534540 commit 54a87e3

File tree

6 files changed

+42
-57
lines changed

6 files changed

+42
-57
lines changed

‎Project/GNU/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ url="http://mediaarea.net"
99
license=('GPL')
1010
source=(${pkgname}_${pkgver}-1.tar.gz)
1111
md5sums=('00000000000000000000000000000000')
12-
arch=('i686' 'x86_64')
12+
arch=('x86_64')
1313

14-
depends=('qt6-base' 'qt6-multimedia' 'qt6-multimedia-ffmpeg' 'qt6-declarative' 'freetype2' 'harfbuzz' 'bzip2' 'zlib' 'yasm')
14+
depends=('qt6-base' 'qt6-svg' 'qt6-multimedia' 'qt6-multimedia-ffmpeg' 'qt6-declarative' 'freetype2' 'harfbuzz' 'zlib' 'nasm')
1515

1616
build() {
1717
cd "${srcdir}/qctools/ffmpeg"
18-
./configure --enable-gpl --enable-version3 --disable-autodetect --disable-programs --disable-securetransport --disable-videotoolbox --enable-static --disable-shared --disable-doc --disable-debug --disable-lzma --disable-iconv --enable-pic --prefix="$(pwd)" --enable-libfreetype --enable-libharfbuzz
18+
./configure --prefix="$(pwd)" --enable-gpl --enable-version3 --disable-autodetect --disable-programs --enable-static --disable-shared --disable-doc --disable-debug --enable-libfreetype --enable-libharfbuzz
1919
make
2020

2121
cd "${srcdir}/qctools/qwt"
22+
patch -p1 < ../qctools/Project/BuildAllFromSource/qwt.patch
2223
export QWT_STATIC=1 QWT_NO_SVG=1 QWT_NO_OPENGL=1 QWT_NO_DESIGNER=1
2324
qmake6
2425
make
@@ -28,7 +29,7 @@ build() {
2829
chmod 644 License.html
2930
mkdir Project/QtCreator/build
3031
cd Project/QtCreator/build
31-
qmake6 DEFINES+=QT_AVPLAYER_MULTIMEDIA ..
32+
qmake6 -after LIBS+=-lharfbuzz LIBS+=-lfreetype ..
3233
make
3334
}
3435

‎Project/GNU/qctools.dsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Version: 1.4-1
66
Maintainer: MediaArea.net SARL <info@mediaarea.net>
77
Homepage: http://www.bavc.org/qctools
88
Standards-Version: 3.7.3
9-
Build-Depends: debhelper (>= 9), qt6-base-dev, qt6-base-private-dev, qt6-declarative-dev, qt6-svg-dev, qt6-multimedia-dev, qmake6, libavcodec59, libavdevice59, libavformat59, libavfilter8, libfreetype-dev, libharfbuzz-dev, libegl1-mesa-dev, libxv-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-xfixes0-dev, libxcb-shape0-dev, zlib1g-dev, libbz2-dev, pkg-config, nasm
9+
Build-Depends: debhelper (>= 10), qt6-base-dev, qt6-declarative-dev, qt6-svg-dev, qt6-multimedia-dev, qmake6, libfreetype-dev, libharfbuzz-dev, libbz2-dev, zlib1g-dev, pkg-config, nasm, libavformat59 | libavformat60 | libavformat61, libavcodec59 | libavcodec60 | libavcodec61
1010
Package-List:
1111
qcli deb utils optional arch=any
1212
qcli-dbg deb debug optional arch=any

‎Project/GNU/qctools.spec‎

Lines changed: 30 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
%define qctools_version 1.4
2-
%define debug_package %{nil}
3-
%define _unpackaged_files_terminate_build 0
42

53
Name: qctools
64
Version: %{qctools_version}
@@ -15,28 +13,37 @@ Source0: %{name}_%{version}-1.tar.gz
1513

1614
Prefix: %{_prefix}
1715
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
16+
BuildRequires: nasm
1817
BuildRequires: gcc-c++
1918
BuildRequires: pkgconfig
2019
BuildRequires: zlib-devel
2120
BuildRequires: freetype-devel
2221
BuildRequires: harfbuzz-devel
23-
%if 0%{?fedora_version} >= 24
24-
BuildRequires: bzip2-devel
25-
%else
26-
%if ! 0%{?mageia}
27-
BuildRequires: libbz2-devel
28-
%endif
29-
%endif
30-
BuildRequires: yasm
31-
%if 0%{?suse_version}
32-
BuildRequires: update-desktop-files
22+
23+
%if 0%{?fedora_version} || 0%{?rhel}
24+
BuildRequires: pkgconfig(Qt6)
25+
BuildRequires: pkgconfig(Qt6Svg)
26+
BuildRequires: pkgconfig(Qt6Multimedia)
27+
BuildRequires: pkgconfig(Qt6Qml)
28+
BuildRequires: pkgconfig(Qt6QuickControls2)
29+
BuildRequires: desktop-file-utils
3330
%endif
3431

35-
%if 0%{?rhel} > 7
36-
BuildRequires: alternatives
32+
%if 0%{?mageia}
33+
BuildRequires: lib64bzip2-devel
34+
BuildRequires: lib64qt6base6-devel
35+
BuildRequires: lib64qt6svg-devel
36+
BuildRequires: lib64qt6qml-devel
37+
BuildRequires: lib64qt6multimedia-devel
38+
BuildRequires: lib64qt6multimediawidgets-devel
39+
BuildRequires: lib64qt6quicktemplates2-devel
40+
BuildRequires: lib64qt6quicktemplates26
41+
BuildRequires: lib64qt6quickcontrols2-devel
42+
BuildRequires: lib64qt6quickcontrols26
43+
BuildRequires: lib64qt6quickwidgets-devel
3744
%endif
3845

39-
%if 0%{?suse_version} >= 1200
46+
%if 0%{?suse_version}
4047
BuildRequires: pkgconfig(Qt6Qml)
4148
BuildRequires: pkgconfig(Qt6Svg)
4249
BuildRequires: pkgconfig(Qt6Core)
@@ -46,38 +53,13 @@ BuildRequires: pkgconfig(Qt6Concurrent)
4653
BuildRequires: pkgconfig(Qt6PrintSupport)
4754
BuildRequires: pkgconfig(Qt6QuickControls2)
4855
BuildRequires: pkgconfig(Qt6Multimedia)
49-
BuildRequires: libXv-devel
56+
BuildRequires: pkgconfig(Qt6MultimediaWidgets)
57+
BuildRequires: update-desktop-files
5058
%endif
5159

52-
%if 0%{?fedora_version} || 0%{?rhel} > 7
53-
BuildRequires: pkgconfig(Qt6)
54-
BuildRequires: pkgconfig(Qt6Qml)
55-
BuildRequires: pkgconfig(Qt6QuickControls2)
56-
BuildRequires: pkgconfig(Qt6Svg)
57-
BuildRequires: pkgconfig(Qt6Multimedia)
58-
BuildRequires: qt6-qtbase-private-devel
59-
BuildRequires: desktop-file-utils
60-
BuildRequires: libxkbcommon-devel
61-
BuildRequires: libXv-devel
62-
6360
%if 0%{?fedora_version} > 39
6461
BuildRequires: libvpl
6562
%endif
66-
%endif
67-
68-
%if 0%{?mageia}
69-
BuildRequires: lib64bzip2-devel
70-
BuildRequires: lib64qt6qml-devel
71-
BuildRequires: lib64qt6base6-devel
72-
BuildRequires: lib64qt6quicktemplates2-devel
73-
BuildRequires: lib64qt6quicktemplates26
74-
BuildRequires: lib64qt6quickcontrols2-devel
75-
BuildRequires: lib64qt6quickcontrols26
76-
BuildRequires: lib64qt6quickwidgets-devel
77-
BuildRequires: lib64qt6multimedia-devel
78-
BuildRequires: lib64qt6multimediawidgets-devel
79-
BuildRequires: lib64qt6svg-devel
80-
%endif
8163

8264
%package -n qcli
8365
Summary: QCTools command line interface
@@ -116,13 +98,14 @@ the digital object, and the associated catalog record.
11698

11799
# build
118100
pushd ffmpeg
119-
./configure --enable-gpl --enable-version3 --disable-autodetect --disable-programs --disable-securetransport --disable-videotoolbox --enable-static --disable-shared --disable-doc --disable-debug --disable-lzma --disable-iconv --enable-pic --prefix="$(pwd)" --enable-libfreetype --enable-libharfbuzz
101+
./configure --prefix="$(pwd)../output" --enable-gpl --enable-version3 --disable-autodetect --disable-programs --enable-static --disable-shared --disable-doc --disable-debug --enable-libfreetype --enable-libharfbuzz
120102
%__make %{?jobs:-j%{jobs}}
121103
popd
122104

123105
pushd qwt
106+
patch -p1 < ../qctools/Project/BuildAllFromSource/qwt.patch
124107
export QWT_STATIC=1 QWT_NO_SVG=1 QWT_NO_OPENGL=1 QWT_NO_DESIGNER=1
125-
qmake
108+
qmake6
126109
%__make %{?jobs:-j%{jobs}}
127110
popd
128111

@@ -131,7 +114,7 @@ pushd qctools
131114
chmod 644 License.html
132115
mkdir Project/QtCreator/build
133116
pushd Project/QtCreator/build
134-
qmake DEFINES+=QT_AVPLAYER_MULTIMEDIA ..
117+
qmake6 .. -after CONFIG+=force_debug_info LIBS+=-lharfbuzz LIBS+=-lfreetype
135118
%__make %{?jobs:-j%{jobs}}
136119
popd
137120
popd
@@ -211,5 +194,5 @@ install -m 644 qctools/Project/GNU/GUI/qctools.metainfo.xml %{buildroot}%{_data
211194
%{_bindir}/qcli
212195

213196
%changelog
214-
* Wed Jan 01 2014 MediaArea.net SARL <info@mediaarea.net> - 0.5.0
215-
- See History.txt for more info and real dates
197+
* Thu Mar 13 2025 MediaArea.net SARL <info@mediaarea.net> - 25.03
198+
- See History.txt for more information

‎debian/compat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9
1+
10

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: qctools
22
Priority: optional
33
Maintainer: MediaArea.net SARL <info@mediaarea.net>
4-
Build-Depends: debhelper (>= 9), qt6-base-dev, qt6-base-private-dev, qt6-declarative-dev, qt6-svg-dev, qt6-multimedia-dev, qmake6, libfreetype-dev, libharfbuzz-dev, libegl1-mesa-dev, libxv-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-xfixes0-dev, libxcb-shape0-dev, zlib1g-dev, libbz2-dev, pkg-config, nasm
4+
Build-Depends: debhelper (>= 10), qt6-base-dev, qt6-declarative-dev, qt6-svg-dev, qt6-multimedia-dev, qmake6, libfreetype-dev, libharfbuzz-dev, libbz2-dev, zlib1g-dev, pkg-config, nasm
55
Standards-Version: 3.7.3
66
Section: utils
77
Homepage: http://www.bavc.org/qctools

‎debian/rules‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ build-stamp: configure-stamp
2121
dh_testdir
2222

2323
# Add here commands to compile the package.
24-
cd ffmpeg && ./configure --enable-gpl --enable-version3 --disable-autodetect --disable-programs --disable-securetransport --disable-videotoolbox --enable-static --disable-shared --disable-doc --disable-debug --disable-lzma --disable-iconv --enable-pic --prefix="$(pwd)" --enable-libfreetype --enable-libharfbuzz
24+
cd ffmpeg && ./configure --prefix="$(pwd)" --enable-gpl --enable-version3 --disable-autodetect --disable-programs --enable-static --disable-shared --disable-doc --disable-debug --enable-libfreetype --enable-libharfbuzz
2525
cd ffmpeg && $(MAKE)
26-
26+
27+
cd qwt && patch -p1 < ../qctools/Project/BuildAllFromSource/qwt.patch
2728
cd qwt && qmake6
2829
cd qwt && $(MAKE)
2930

3031
mkdir qctools/Project/QtCreator/build
31-
cd qctools/Project/QtCreator/build && qmake6 DEFINES+=QT_AVPLAYER_MULTIMEDIA ..
32+
cd qctools/Project/QtCreator/build && qmake6 .. -after CONFIG+=force_debug_info LIBS+=-lharfbuzz LIBS+=-lfreetype
3233
cd qctools/Project/QtCreator/build && $(MAKE)
3334

3435
touch $@

0 commit comments

Comments
 (0)