New package: antimicrox-3.1.2.

antimicro: transition to antimicrox.

Closes: #26631 [via git-merge-pr]
This commit is contained in:
fosslinux 2020-11-14 17:44:20 +11:00 committed by Andrew J. Hesford
parent 6fb6957ade
commit 894b9a3b66
7 changed files with 177 additions and 19 deletions

View File

@ -3999,3 +3999,4 @@ libtickit.so.3 libtickit-0.4.1_1
libnotcurses.so.2 notcurses-2.0.4_1
libnotcurses++.so.2 notcurses-2.0.4_1
libevemu.so.3 evemu-2.7.0_1
libantilib.so.1 libantimicrox-3.1.2_1

1
srcpkgs/antimicro Symbolic link
View File

@ -0,0 +1 @@
antimicrox

View File

@ -1,19 +0,0 @@
# Template file for 'antimicro'
pkgname=antimicro
version=2.23
revision=1
build_style=cmake
configure_args="-DUSE_SDL_2=ON"
hostmakedepends="pkg-config itstool"
makedepends="qt5-tools-devel libXtst-devel SDL2-devel"
short_desc="GUI program used to map keyboard keys and mouse controls to a gamepad"
maintainer="7185 <7185@free.fr>"
license="GPL-3"
homepage="https://github.com/AntiMicro/antimicro"
distfiles="https://github.com/AntiMicro/antimicro/archive/${version}.tar.gz"
checksum=ef309170612da805992f9194f1973bf38a3174a0856856afedab67f9d927a9ef
broken="lots of undefined references during linkage"
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
fi

View File

@ -0,0 +1,136 @@
From 1833a1740c23d15c940f5fdf3c00893b7121d11e Mon Sep 17 00:00:00 2001
From: Gergely Gombos <gombosg@disroot.org>
Date: Sun, 8 Nov 2020 18:41:56 +0100
Subject: [PATCH 1/2] fix: fix linking error on armv7hl
---
CMakeLists.txt | 18 +++++++++---------
src/gamecontroller/xml/gamecontrollerdpadxml.h | 1 +
src/xml/joydpadxml.cpp | 3 ++-
src/xml/joydpadxml.h | 2 --
4 files changed, 12 insertions(+), 12 deletions(-)
Backported by fosslinux.
diff --git CMakeLists.txt CMakeLists.txt
index 90f382c1..cfb7410d 100755
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -232,7 +232,7 @@ set(antimicrox_SOURCES
src/xml/joyaxisxml.cpp
src/xml/joybuttonslotxml.cpp
src/xml/joybuttonxml.cpp
- #src/xml/joydpadxml.cpp
+ src/xml/joydpadxml.cpp
src/xml/setjoystickxml.cpp
src/xmlconfigmigration.cpp
src/xmlconfigreader.cpp
@@ -514,16 +514,16 @@ endif(UNIX)
set_target_properties(antilib PROPERTIES
SOVERSION ${ANTILIB_VERSION}
)
-
-
+
+
#target_link_libraries (antilib Qt5::Widgets Qt5::Core Qt5::Test Qt5::Gui Qt5::Network Qt5::Concurrent ${SDL_LIBRARY} ${LIBS})
target_link_libraries (antilib Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Network Qt5::Concurrent ${SDL_LIBRARY} ${LIBS})
if (WITH_X11)
target_link_libraries(antilib Qt5::X11Extras)
endif()
-
-
+
+
add_executable(antimicrox ${antimicrox_MAIN})
target_link_libraries (antimicrox antilib Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Network Qt5::Concurrent)
@@ -682,10 +682,10 @@ if(UNIX)
if(CPACK_GENERATOR STREQUAL "DEB")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "qtbase5-dev, libsdl2-2.0-0, libqt5x11extras5, libc6")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "pktiuk <kotiuk@zohomail.eu>")
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AntiMicroX is a graphical program used to map gamepad buttons to keyboard, mouse, scripts and macros.
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AntiMicroX is a graphical program used to map gamepad buttons to keyboard, mouse, scripts and macros.
It is a new fork of discontinued AntiMicro.")
-
+
message("Preparing documentation for DEB package")
add_custom_target(package_docummentation ALL)
@@ -697,10 +697,10 @@ It is a new fork of discontinued AntiMicro.")
#Strip binaries from unnecessary notes, comments, etc
add_custom_command(TARGET antimicrox POST_BUILD
COMMAND strip --strip-unneeded --remove-section=.comment --remove-section=.note "${CMAKE_CURRENT_BINARY_DIR}/bin/antimicrox" VERBATIM)
-
+
add_custom_command(TARGET antimicrox POST_BUILD
COMMAND strip --strip-unneeded --remove-section=.comment --remove-section=.note "${CMAKE_CURRENT_BINARY_DIR}/libantilib.so.1" VERBATIM)
-
+
endif()
set(CPACK_PACKAGE_EXECUTABLES "antimicrox" "antimicrox")
diff --git src/gamecontroller/xml/gamecontrollerdpadxml.h src/gamecontroller/xml/gamecontrollerdpadxml.h
index 25ce7927..4a68ff31 100644
--- src/gamecontroller/xml/gamecontrollerdpadxml.h
+++ src/gamecontroller/xml/gamecontrollerdpadxml.h
@@ -19,6 +19,7 @@
#define GAMECONTROLLERDPADXML_H
#include "xml/joydpadxml.h"
+#include "vdpad.h"
class GameControllerDPad;
class QXmlStreamReader;
diff --git src/xml/joydpadxml.cpp src/xml/joydpadxml.cpp
index 2ce01701..a35e70d0 100644
--- src/xml/joydpadxml.cpp
+++ src/xml/joydpadxml.cpp
@@ -1,4 +1,5 @@
+#include "joydpadxml.h"
#include "globalvariables.h"
#include "gamecontroller/gamecontrollerdpad.h"
@@ -143,3 +143,3 @@
template class JoyDPadXml<JoyDPad>;
template class JoyDPadXml<VDPad>;
-//template class JoyDPadXml<GameControllerDPad>;
+template class JoyDPadXml<GameControllerDPad>;
diff --git src/xml/joydpadxml.h src/xml/joydpadxml.h
index b53afb7a..88ed77b1 100644
--- src/xml/joydpadxml.h
+++ src/xml/joydpadxml.h
@@ -37,6 +37,4 @@ template <class T> class JoyDPadXml : public QObject
T *m_joydpad;
};
-#include "joydpadxml.cpp"
-
#endif // JOYDPADXML_H
From 020bb55da5a8e880d8a82032d326941fa40c7875 Mon Sep 17 00:00:00 2001
From: Gergely Gombos <gombosg@disroot.org>
Date: Mon, 9 Nov 2020 12:37:42 +0100
Subject: [PATCH 2/2] chore: linter fix
---
src/gamecontroller/xml/gamecontrollerdpadxml.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/gamecontroller/xml/gamecontrollerdpadxml.h src/gamecontroller/xml/gamecontrollerdpadxml.h
index 4a68ff31..9ab697df 100644
--- src/gamecontroller/xml/gamecontrollerdpadxml.h
+++ src/gamecontroller/xml/gamecontrollerdpadxml.h
@@ -18,8 +18,8 @@
#ifndef GAMECONTROLLERDPADXML_H
#define GAMECONTROLLERDPADXML_H
-#include "xml/joydpadxml.h"
#include "vdpad.h"
+#include "xml/joydpadxml.h"
class GameControllerDPad;
class QXmlStreamReader;

View File

@ -0,0 +1,37 @@
# Template file for 'antimicrox'
pkgname=antimicrox
version=3.1.2
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake
qt5-host-tools"
makedepends="qt5-tools-devel SDL2-devel libXi-devel libXtst-devel libX11-devel
qt5-x11extras-devel"
short_desc="Map keyboard buttons and mouse controls to a gamepad"
maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-or-later"
homepage="https://github.com/AntiMicroX/antimicrox"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=18539897caed5021003f590cb4baeacf039897c6ff1542697901f573d5a758dc
libantimicrox_package() {
short_desc+=" - libraries"
pkg_install() {
vmove usr/lib/*.so.*
}
}
libantimicrox-devel_package() {
depends="libantimicrox>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/lib/*.so
vmove usr/include
}
}
antimicro_package() {
build_style=meta
depends="${sourcepkg}"
short_desc+=" - transitional dummy package"
}

1
srcpkgs/libantimicrox Symbolic link
View File

@ -0,0 +1 @@
antimicrox

1
srcpkgs/libantimicrox-devel Symbolic link
View File

@ -0,0 +1 @@
antimicrox