Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: AntiMicroX and drop antimicro
@ 2020-11-23  8:04 fosslinux
  2020-11-23  8:06 ` [PR PATCH] [Updated] " fosslinux
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: fosslinux @ 2020-11-23  8:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages AntiMicroX-new
https://github.com/void-linux/void-packages/pull/26631

New package: AntiMicroX and drop antimicro
`AntiMicroX` is the de-facto sucessor to antimicro and has a number of new features.

A patch file from https://github.com/void-linux/void-packages/pull/26631.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-AntiMicroX-new-26631.patch --]
[-- Type: text/x-diff, Size: 9042 bytes --]

From 82b0314d31c38001dadf85d09016d4d6ceec5997 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 14 Nov 2020 17:44:20 +1100
Subject: [PATCH 1/2] New package: AntiMicroX-3.1.2.

---
 common/shlibs                        |   1 +
 srcpkgs/AntiMicroX/patches/arm.patch | 136 +++++++++++++++++++++++++++
 srcpkgs/AntiMicroX/template          |  32 +++++++
 srcpkgs/libAntiMicroX                |   1 +
 srcpkgs/libAntiMicroX-devel          |   1 +
 5 files changed, 171 insertions(+)
 create mode 100644 srcpkgs/AntiMicroX/patches/arm.patch
 create mode 100644 srcpkgs/AntiMicroX/template
 create mode 120000 srcpkgs/libAntiMicroX
 create mode 120000 srcpkgs/libAntiMicroX-devel

diff --git a/common/shlibs b/common/shlibs
index 51c9ba0635a..e87b3b44c57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3998,3 +3998,4 @@ libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
+libantilib.so.1 libantilib-3.1.2_1
diff --git a/srcpkgs/AntiMicroX/patches/arm.patch b/srcpkgs/AntiMicroX/patches/arm.patch
new file mode 100644
index 00000000000..6bd0b1b204a
--- /dev/null
+++ b/srcpkgs/AntiMicroX/patches/arm.patch
@@ -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;
diff --git a/srcpkgs/AntiMicroX/template b/srcpkgs/AntiMicroX/template
new file mode 100644
index 00000000000..5a9db43dd75
--- /dev/null
+++ b/srcpkgs/AntiMicroX/template
@@ -0,0 +1,32 @@
+# Template file for 'AntiMicroX'
+pkgname=AntiMicroX
+version=3.1.2
+revision=1
+build_style=cmake
+wrksrc="antimicrox-${version}"
+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"
+depends=""
+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="https://github.com/AntiMicroX/antimicrox/archive/${version}.tar.gz"
+checksum=18539897caed5021003f590cb4baeacf039897c6ff1542697901f573d5a758dc
+
+libAntiMicroX_package() {
+	short_desc+=" - libraries"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+	}
+}
+
+libAntiMicroX-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/*.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/libAntiMicroX b/srcpkgs/libAntiMicroX
new file mode 120000
index 00000000000..da0e87aac4f
--- /dev/null
+++ b/srcpkgs/libAntiMicroX
@@ -0,0 +1 @@
+AntiMicroX
\ No newline at end of file
diff --git a/srcpkgs/libAntiMicroX-devel b/srcpkgs/libAntiMicroX-devel
new file mode 120000
index 00000000000..da0e87aac4f
--- /dev/null
+++ b/srcpkgs/libAntiMicroX-devel
@@ -0,0 +1 @@
+AntiMicroX
\ No newline at end of file

From 9a41794306d0b0faa6805eafc4d7953c79deb813 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 21 Nov 2020 08:48:54 +1100
Subject: [PATCH 2/2] antimicro: drop package.

Currently unmaintained.
---
 srcpkgs/antimicro/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/antimicro/template

diff --git a/srcpkgs/antimicro/template b/srcpkgs/antimicro/template
deleted file mode 100644
index c46bf6bc497..00000000000
--- a/srcpkgs/antimicro/template
+++ /dev/null
@@ -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

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-11-25  1:18 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23  8:04 [PR PATCH] New package: AntiMicroX and drop antimicro fosslinux
2020-11-23  8:06 ` [PR PATCH] [Updated] " fosslinux
2020-11-24 20:37 ` [PR REVIEW] " ahesford
2020-11-24 20:37 ` ahesford
2020-11-24 20:37 ` ahesford
2020-11-24 20:37 ` ahesford
2020-11-24 20:37 ` ahesford
2020-11-24 22:01 ` fosslinux
2020-11-25  1:16 ` ahesford
2020-11-25  1:18 ` fosslinux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).