Skip to content

Commit e7dc953

Browse files
Chr1sNoCalcProgrammer1
Chr1sNo
authored and
CalcProgrammer1
committed
Changing the Linux executable (only) to lowercase openrgb
Commits squashed by Adam Honse <calcprogrammer1@gmail.com>
1 parent f70c9cc commit e7dc953

7 files changed

Lines changed: 113 additions & 85 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,14 @@ build_linux_32:
3434
image: i386/ubuntu:bionic
3535
stage: build
3636
script:
37-
- ./scripts/build-appimage-32.sh
37+
- export $(dpkg-architecture)
38+
- ./scripts/build-appimage.sh
3839

3940
artifacts:
4041
paths:
4142
- OpenRGB-i386.AppImage
43+
- 60-openrgb.rules
44+
- README.md
4245
expire_in: 30 days
4346

4447
#-----------------------------------------------------------------------#
@@ -49,11 +52,14 @@ build_linux_64:
4952
image: ubuntu:bionic
5053
stage: build
5154
script:
55+
- export $(dpkg-architecture)
5256
- ./scripts/build-appimage.sh
5357

5458
artifacts:
5559
paths:
5660
- OpenRGB-x86_64.AppImage
61+
- 60-openrgb.rules
62+
- README.md
5763
expire_in: 30 days
5864

5965
#-----------------------------------------------------------------------#
@@ -65,7 +71,6 @@ build_linux_deb32:
6571
stage: build
6672
script:
6773
- apt install -y debhelper
68-
- export $( dpkg-architecture -s --target-arch i386; )
6974
- dpkg-architecture -l
7075
- dpkg-buildpackage --target-arch i386 -us -B
7176
- rm -v ../openrgb-dbgsym*.ddeb

‎OpenRGB.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,8 @@ win32:contains(QMAKE_TARGET.arch, x86) {
634634
# Linux-specific Configuration #
635635
#-----------------------------------------------------------------------------------------------#
636636
unix:!macx {
637+
TARGET = $$lower($$TARGET)
638+
637639
INCLUDEPATH += \
638640
Controllers/FaustusController \
639641
Controllers/LinuxLEDController \

‎debian/copyright‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
This package was debianized by Adam Honse <CalcProgrammer1@gmail.com> on
2+
3rd December 2020.
3+
4+
The current Debian maintainer is Chris M <galdarian@gmail.com>
5+
6+
It was downloaded from: https://gitlab.com/CalcProgrammer1/OpenRGB
7+
8+
Upstream Authors: Adam Honse, Chris M, Dmitry K
9+
10+
License: GPL-2+
11+
Copyright: 2019 - Present Adam Honse
12+
13+
This program is free software; you can redistribute it and/or modify
14+
it under the terms of the GNU General Public License as published by
15+
the Free Software Foundation; either version 2 of the License.
16+
17+
This program is distributed in the hope that it will be useful,
18+
but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
GNU General Public License for more details.
21+
22+
You should have received a copy of the GNU General Public License with
23+
the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
24+
if not, write to the Free Software Foundation, Inc., 59 Temple Place,
25+
Suite 330, Boston, MA 02111-1307 USA
26+
27+
On Debian systems, the complete text of the GNU General Public
28+
License, version 2, can be found in /usr/share/common-licenses/GPL-2.
29+
30+
License: GPL-2+
31+
The Files in ./* are Copyright 2019 - Present Adam Honse
32+
33+
This library is free software; you can redistribute it and/or
34+
modify it under the terms of the GNU Lesser General Public
35+
License as published by the Free Software Foundation; either
36+
version 2.1 of the License, or (at your option) any later version.
37+
38+
This library is distributed in the hope that it will be useful,
39+
but WITHOUT ANY WARRANTY; without even the implied warranty of
40+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41+
Lesser General Public License for more details.
42+
43+
You should have received a copy of the GNU Lesser General Public
44+
License along with this library; if not, write to the Free Software
45+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
46+
47+
On Debian systems, the complete text of the GNU Lesser General Public
48+
License, can be found in /usr/share/common-licenses/LGPL.
49+
50+
The Debian packaging is (C) 2006, Chris M <galdarian@gmail.com> and
51+
is licensed under the GPL, see above.

‎qt/OpenRGB.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Type=Application
33
Encoding=UTF-8
44
Name=OpenRGB
55
Comment=Control RGB lighting
6-
Exec=OpenRGB
6+
Exec=openrgb
77
Icon=OpenRGB
88
Terminal=false
99
Categories=Utility;

‎scripts/AppImage.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
3+
diff --git a/OpenRGB.pro b/OpenRGB.pro
4+
index 0b308bb9..75a2199f 100644
5+
--- a/OpenRGB.pro
6+
+++ b/OpenRGB.pro
7+
@@ -634,8 +634,6 @@ win32:contains(QMAKE_TARGET.arch, x86) {
8+
# Linux-specific Configuration #
9+
#-----------------------------------------------------------------------------------------------#
10+
unix:!macx {
11+
- TARGET = $$lower($$TARGET)
12+
-
13+
INCLUDEPATH += \
14+
Controllers/FaustusController \
15+
Controllers/LinuxLEDController \
16+
diff --git a/qt/OpenRGB.desktop b/qt/OpenRGB.desktop
17+
index bd71a38a..b4a0f86a 100644
18+
--- a/qt/OpenRGB.desktop
19+
+++ b/qt/OpenRGB.desktop
20+
@@ -3,7 +3,7 @@ Type=Application
21+
Encoding=UTF-8
22+
Name=OpenRGB
23+
Comment=Control RGB lighting
24+
-Exec=openrgb
25+
+Exec=OpenRGB
26+
Icon=OpenRGB
27+
Terminal=false
28+
Categories=Utility;

‎scripts/build-appimage-32.sh‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎scripts/build-appimage.sh‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,27 @@ if [ "$CI" == "" ] && [ -d /dev/shm ]; then
1717
else
1818
TEMP_BASE=/tmp
1919
fi
20-
2120
BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" appimage-build-XXXXXX)
2221

22+
#-----------------------------------------------------------------------#
23+
# This checks the Architecture of the system to work out if we're #
24+
# building on i386 or x86_64 and saves for later use #
25+
#-----------------------------------------------------------------------#
26+
27+
if [ ${DEB_HOST_ARCH:0:1} == ${DEB_HOST_GNU_CPU:0:1} ]; then
28+
ARCH="$DEB_HOST_ARCH"
29+
else
30+
ARCH="$DEB_HOST_GNU_CPU"
31+
fi
32+
echo Inputs: "$DEB_HOST_ARCH" "$DEB_HOST_GNU_CPU"
33+
echo Calculated: "$ARCH"
34+
35+
#-----------------------------------------------------------------------#
36+
# Small fixes for CamelCase vs lowercase #
37+
#-----------------------------------------------------------------------#
38+
TARGET=OpenRGB
39+
patch -p1 -i scripts/AppImage.patch
40+
2341
#-----------------------------------------------------------------------#
2442
# Make sure to clean up build dir, even if errors occur #
2543
#-----------------------------------------------------------------------#
@@ -51,7 +69,7 @@ qmake "$REPO_ROOT"
5169
#-----------------------------------------------------------------------#
5270
# Build project and install files into AppDir #
5371
#-----------------------------------------------------------------------#
54-
make -j$(nproc)
72+
make -j$(nproc) TARGET="$TARGET"
5573
make install INSTALL_ROOT=AppDir
5674

5775
#-----------------------------------------------------------------------#
@@ -65,12 +83,12 @@ chmod +x "$REPO_ROOT"/scripts/tools/linuxdeploy*.AppImage
6583
#-----------------------------------------------------------------------#
6684
export QML_SOURCES_PATHS="$REPO_ROOT"/src
6785

68-
"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop
69-
"$REPO_ROOT"/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract-and-run --appdir AppDir
70-
"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --output appimage
86+
"$REPO_ROOT"/scripts/tools/linuxdeploy-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir -e "$TARGET" -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop
87+
"$REPO_ROOT"/scripts/tools/linuxdeploy-plugin-qt-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir
88+
"$REPO_ROOT"/scripts/tools/linuxdeploy-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir --output appimage
7189

7290
#-----------------------------------------------------------------------#
7391
# Move built AppImage back into original CWD #
7492
#-----------------------------------------------------------------------#
75-
mv OpenRGB*.AppImage "$OLD_CWD"
93+
mv -v "$TARGET"*.AppImage "$OLD_CWD"
7694

0 commit comments

Comments
 (0)