[packages/qmmp-plugin-pack] - up to 1.6.1, xmp in main package now
baggins
baggins at pld-linux.org
Sat Oct 21 23:43:35 CEST 2023
commit 07611e62ba97d9a82e3d9f62fc6f1e021039d345
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Oct 21 23:43:20 2023 +0200
- up to 1.6.1, xmp in main package now
qmmp-plugin-pack-x32.patch | 99 ----------------------------------------------
qmmp-plugin-pack.spec | 43 +++++---------------
2 files changed, 9 insertions(+), 133 deletions(-)
---
diff --git a/qmmp-plugin-pack.spec b/qmmp-plugin-pack.spec
index f830b40..148dbd3 100644
--- a/qmmp-plugin-pack.spec
+++ b/qmmp-plugin-pack.spec
@@ -1,14 +1,13 @@
-%define qmmp_ver 1.3.0
+%define qmmp_ver 1.6.0
Summary: Qmmp Plugin Pack
Summary(pl.UTF-8): Zestaw wtyczek dla odtwarzacza Qmmp
Name: qmmp-plugin-pack
-Version: 1.3.1
-Release: 2
+Version: 1.6.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Multimedia
-Source0: http://qmmp.ylsoftware.com/files/plugins/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d887d991206cdd638f2e50420e4aa72
-Patch0: %{name}-x32.patch
+Source0: https://qmmp.ylsoftware.com/files/qmmp-plugin-pack/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 6ae955fa3e976fc3a791694e5ab90342
URL: http://qmmp.ylsoftware.com/plugins.php
BuildRequires: Qt5Sql-devel >= 5.4.0
BuildRequires: Qt5Widgets-devel >= 5.4.0
@@ -17,7 +16,6 @@ BuildRequires: cmake >= 2.8.11
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: libmpg123-devel >= 1.13.0
BuildRequires: libsamplerate-devel >= 0.1.2
-BuildRequires: libxmp-devel >= 4.2.0
BuildRequires: pkgconfig
BuildRequires: qmmp-devel >= %{qmmp_ver}
BuildRequires: qt5-build >= 5.4.0
@@ -31,7 +29,6 @@ Obsoletes: qmmp-input-mpg123 < 1.3.1-1
Requires: qmmp-effect-srconverter = %{version}-%{release}
Requires: qmmp-engine-ffvideo = %{version}-%{release}
Requires: qmmp-input-ffap = %{version}-%{release}
-Requires: qmmp-input-xmp = %{version}-%{release}
Requires: qmmp-visual-goom = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +39,6 @@ Plugin Pack is a set of extra plugins for Qmmp:
embedded cue support)
- MPG123 - MPEG v1/2 layer1/2/3 decoder with use of the libmpg123
library
-- XMP - module player with use of the libxmp library
%description -l pl.UTF-8
Plugin Pack to zestaw dodatkowych wtyczek dla odtwarzacza Qmmp:
@@ -51,7 +47,6 @@ Plugin Pack to zestaw dodatkowych wtyczek dla odtwarzacza Qmmp:
oraz obsługa wbudowanych metadanych cue)
- MPG123 - dekoder MPEG v1/2 layer1/2/3 wykorzystujący bibliotekę
libmpg123
-- XMP - odtwarzacz modułów wykorzystujący bibliotekę libxmp
%package -n qmmp-effect-srconverter
Summary: Sample Rate Converter module for Qmmp
@@ -100,21 +95,6 @@ FFap input plugin is an enhanced Monkey's Audio (APE) decoder with
Wtyczka wejściowa FFap to rozszerzony dekoder Monkey's Audio (APE),
obsługujący 24-bitowe próbki oraz wbudowane metadane cue.
-%package -n qmmp-input-xmp
-Summary: XMP input plugin for Qmmp
-Summary(pl.UTF-8): Wtyczka wejściowa XMP dla odtwarzacza Qmmp
-Group: Libraries
-Requires: Qt5Widgets >= 5.4.0
-Requires: libxmp >= 4.2.0
-Requires: qmmp >= %{qmmp_ver}
-
-%description -n qmmp-input-xmp
-XMP input plugin is a module player with use of the libxmp library.
-
-%description -n qmmp-input-xmp -l pl.UTF-8
-Wtyczka wejściowa XMP to odtwarzacz modułów wykorzystujący bibliotekę
-libxmp.
-
%package -n qmmp-visual-goom
Summary: Goom visualization plugin for Qmmp
Summary(pl.UTF-8): Wtyczka wizualizacji Goom dla odtwarzacza Qmmp
@@ -130,7 +110,6 @@ Wtyczka wizualizacji Goom dla odtwarzacza Qmmp.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
@@ -158,21 +137,17 @@ rm -rf $RPM_BUILD_ROOT
%files -n qmmp-effect-srconverter
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libsrconverter.so
+%attr(755,root,root) %{_libdir}/qmmp-1.6/Effect/libsrconverter.so
%files -n qmmp-engine-ffvideo
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qmmp-1.3/Engines/libffvideo.so
+%attr(755,root,root) %{_libdir}/qmmp-1.6/Engines/libffvideo.so
%files -n qmmp-input-ffap
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libffap.so
-
-%files -n qmmp-input-xmp
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libxmp.so
+%attr(755,root,root) %{_libdir}/qmmp-1.6/Input/libffap.so
%files -n qmmp-visual-goom
%defattr(644,root,root,755)
%doc src/Visual/goom/CHANGES
-%attr(755,root,root) %{_libdir}/qmmp-1.3/Visual/libgoom.so
+%attr(755,root,root) %{_libdir}/qmmp-1.6/Visual/libgoom.so
diff --git a/qmmp-plugin-pack-x32.patch b/qmmp-plugin-pack-x32.patch
deleted file mode 100644
index 6d67b90..0000000
--- a/qmmp-plugin-pack-x32.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- qmmp-plugin-pack-1.1.3/src/Input/ffap/CMakeLists.txt.orig 2016-10-04 14:45:00.000000000 +0200
-+++ qmmp-plugin-pack-1.1.3/src/Input/ffap/CMakeLists.txt 2017-05-24 16:27:29.130890035 +0200
-@@ -59,16 +59,29 @@
-
- message("-- Architecture: x86")
- ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-+ IF(LIB_SUFFIX STREQUAL "x32")
-+ ADD_DEFINITIONS(-DARCH_X86_32)
-+
-+ add_custom_command(OUTPUT x86inc.o
-+ COMMAND yasm ARGS -m amd64 -f elfx32 -DARCH_X86_64 -DPIC x86inc.asm -o ${CMAKE_CURRENT_BINARY_DIR}/x86inc.o
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMENT "compiling x86inc.asm")
-+ add_custom_command(OUTPUT dsputil_yasm.o
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMAND yasm ARGS -m amd64 -f elfx32 -DARCH_X86_64 -DPIC dsputil_yasm.asm -o ${CMAKE_CURRENT_BINARY_DIR}/dsputil_yasm.o
-+ DEPENDS x86inc.o COMMENT "compiling dsputil_yasm.asm")
-+ ELSE(LIB_SUFFIX STREQUAL "x32")
- ADD_DEFINITIONS(-DARCH_X86_64)
-
- add_custom_command(OUTPUT x86inc.o
- COMMAND yasm ARGS -m amd64 -f elf64 -DARCH_X86_64 -DPIC x86inc.asm -o ${CMAKE_CURRENT_BINARY_DIR}/x86inc.o
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "compiling x86inc.asm")
- add_custom_command(OUTPUT dsputil_yasm.o
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND yasm ARGS -m amd64 -f elf64 -DARCH_X86_64 -DPIC dsputil_yasm.asm -o ${CMAKE_CURRENT_BINARY_DIR}/dsputil_yasm.o
- DEPENDS x86inc.o COMMENT "compiling dsputil_yasm.asm")
-+ ENDIF(LIB_SUFFIX STREQUAL "x32")
-
- message("-- Architecture: x86_64")
- ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86)$")
---- qmmp-plugin-pack-1.1.3/src/Input/ffap/ffap.c.orig 2016-10-04 14:45:00.000000000 +0200
-+++ qmmp-plugin-pack-1.1.3/src/Input/ffap/ffap.c 2017-05-24 16:25:39.245492751 +0200
-@@ -47,6 +47,9 @@
- #include <math.h>
- #include "ffap.h"
-
-+#if ARCH_X86_32 || ARCH_X86_64
-+#include <cpuid.h>
-+#endif
-
- #if defined(_WIN32) && ! defined(_MSC_VER)
- #include <malloc.h>
-@@ -1760,38 +1763,16 @@
- uint32_t max_std_level, max_ext_level, std_caps=0, ext_caps=0;
-
- #if ARCH_X86_32
-- x86_reg a, c;
-- __asm__ volatile (
-- /* See if CPUID instruction is supported ... */
-- /* ... Get copies of EFLAGS into eax and ecx */
-- "pushfl\n\t"
-- "pop %0\n\t"
-- "mov %0, %1\n\t"
--
-- /* ... Toggle the ID bit in one copy and store */
-- /* to the EFLAGS reg */
-- "xor $0x200000, %0\n\t"
-- "push %0\n\t"
-- "popfl\n\t"
--
-- /* ... Get the (hopefully modified) EFLAGS */
-- "pushfl\n\t"
-- "pop %0\n\t"
-- : "=a" (a), "=c" (c)
-- :
-- : "cc"
-- );
--
-- if (a == c) {
-+ if (__get_cpuid_max(0, NULL) == 0) {
- trace ("ffap: cpuid is not supported\n");
- return 0; /* CPUID not supported */
- }
- #endif
-
-- cpuid(0, max_std_level, ebx, ecx, edx);
-+ __get_cpuid(0, &max_std_level, &ebx, &ecx, &edx);
-
- if(max_std_level >= 1){
-- cpuid(1, eax, ebx, ecx, std_caps);
-+ __get_cpuid(1, &eax, &ebx, &ecx, &std_caps);
- if (std_caps & (1<<23))
- rval |= FF_MM_MMX;
- if (std_caps & (1<<25))
-@@ -1812,10 +1793,10 @@
- ;
- }
-
-- cpuid(0x80000000, max_ext_level, ebx, ecx, edx);
-+ __get_cpuid(0x80000000, &max_ext_level, &ebx, &ecx, &edx);
-
- if(max_ext_level >= 0x80000001){
-- cpuid(0x80000001, eax, ebx, ecx, ext_caps);
-+ __get_cpuid(0x80000001, &eax, &ebx, &ecx, &ext_caps);
- if (ext_caps & (1<<31))
- rval |= FF_MM_3DNOW;
- if (ext_caps & (1<<30))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qmmp-plugin-pack.git/commitdiff/07611e62ba97d9a82e3d9f62fc6f1e021039d345
More information about the pld-cvs-commit
mailing list