diff --git a/.gitignore b/.gitignore index 4005f0e..6bf27b7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libprojectM-2.0.1.tar.bz2 /libprojectM-3.1.1-rc3.tar.gz /libprojectM-f2e0a32.tar.gz /libprojectM-3.1.1-rc4.tar.gz +/libprojectM-3.1.1-rc7.tar.gz diff --git a/3c431fc43e8318bdcd48b66eb50e07655e915f80.patch b/3c431fc43e8318bdcd48b66eb50e07655e915f80.patch deleted file mode 100644 index abf843b..0000000 --- a/3c431fc43e8318bdcd48b66eb50e07655e915f80.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3c431fc43e8318bdcd48b66eb50e07655e915f80 Mon Sep 17 00:00:00 2001 -From: Luigi Baldoni -Date: Wed, 6 Mar 2019 10:33:44 +0100 -Subject: [PATCH] Extend the search path for Qt-related tools - ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c4ba201e..c5c87800 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,6 +151,11 @@ AX_CHECK_COMPILE_FLAG([-std=c++11], [ - AC_ARG_ENABLE([qt], AS_HELP_STRING([--enable-qt], [Enable Qt: needed for pulseaudio and jack GUIs]), [], [enable_qt=check]) - AS_IF([test "$enable_qt" != "no"], - [ -+ case $host_os in -+ linux*) -+ PATH="$PATH:`pkg-config --variable=host_bins Qt5Core`" -+ ;; -+ esac - AX_HAVE_QT # m4/qt.m4 - - AS_IF([test "$have_qt" = "yes"], [ diff --git a/libprojectM.spec b/libprojectM.spec index 94e1aa3..288bffe 100644 --- a/libprojectM.spec +++ b/libprojectM.spec @@ -1,21 +1,21 @@ -%global reltag rc4 +%global reltag rc7 %global commit0 f2e0a32368e73a26746b0ac04a9182b23256825f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libprojectM Version: 3.1.1 -Release: 0.7.rc4%{?dist} +Release: 0.8.rc7%{?dist} Summary: The libraries for the projectM music visualization plugin License: LGPLv2+ URL: https://github.com/projectM-visualizer/projectm -Source0: https://github.com/projectM-visualizer/projectm/archive/%{version}-%{reltag}/libprojectM-%{version}-%{reltag}.tar.gz +Source0: https://github.com/projectM-visualizer/projectm/archive/v%{version}-%{reltag}/libprojectM-%{version}-%{reltag}.tar.gz #Source0: https://github.com/projectM-visualizer/projectm/archive/%%{commit0}/%%{name}-%%{shortcommit0}.tar.gz #Patch1: projectM-disable_native_plugins.patch -Patch2: 3c431fc43e8318bdcd48b66eb50e07655e915f80.patch #Patch3: projectm-3.1.0-autotools.patch BuildRequires: libtool BuildRequires: gcc-c++ +BuildRequires: desktop-file-utils BuildRequires: libgomp BuildRequires: pkgconfig(glesv2) #BuildRequires: pkgconfig(glew) @@ -29,17 +29,15 @@ BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) #BuildRequires: pkgconfig(Qt5Xml) #BuildRequires: cmake(Qt5LinguistTools) - - #projectM-jack BuildRequires: jack-audio-connection-kit-devel -BuildRequires: desktop-file-utils -%if !0%{?rhel} #projectM-libvisual +%if !0%{?rhel} #BuildRequires: libvisual-devel = 1:0.4.0 %endif #projectM-pulseaudio BuildRequires: pkgconfig(libpulse) +#BuildRequires: llvm-devel BuildRequires: dejavu-sans-mono-fonts BuildRequires: dejavu-sans-fonts @@ -51,10 +49,6 @@ Provides: libprojectM-qt = %{version}-%{release} Obsoletes: libprojectM-qt < %{version}-%{release} Obsoletes: projectM-libvisual < %{version}-%{release} -#if 0%%{?fedora} = 29 -#xcludearch: %%{ix86} -#endif - %description projectM is an awesome music visualizer. There is nothing better in the world of Unix. projectM's greatness comes from the hard work of the community. Users @@ -116,29 +110,34 @@ libvisual compatible applications. #setup -q -n projectm-%%{commit0} %setup -q -n projectm-%{version}-%{reltag} #patch1 -p1 -%patch2 -p1 chmod -x LICENSE.txt -find -name "*.?pp" -exec chmod -x {} ';' +chmod -x presets/tests/README.md + +find -name "*.?pp" -type f -exec chmod -x {} ';' find -name "*.c" -exec chmod -x {} ';' find -name "*.h" -exec chmod -x {} ';' +find -name "*inl" -exec chmod -x {} ';' %build #export CXXFLAGS="%{optflags} -Wl,--as-needed" ./autogen.sh -# from rpm -E %%{cmake_kf5} to detect qmake in /usr/lib64/qt5/bin -# export PATH="%{_libdir}/qt5/bin:$PATH" ; +%configure --disable-static --disable-rpath --enable-sdl --enable-threading \ + --enable-gles --enable-qt --enable-preset-subdirs -#QMAKE=%%{_qt5_qmake} -#QMAKE_FLAGS=%%{?_qt5_qmake_flags} +# --enable-emscripten Build for web with emscripten +# --enable-preset-subdirs Organize presets into subdirectories. +# --enable-llvm Support for JIT using LLVM -%configure --disable-static --disable-rpath --enable-sdl --enable-threading --enable-gles --enable-qt %make_build %install %make_install find %{buildroot} -name '*.la' -delete +find %{buildroot} -name "*inl" -exec chmod -x {} ';' +find %{buildroot} -name "*milk" -exec chmod -x {} ';' +find %{buildroot} -name "*prjm" -exec chmod -x {} ';' #replace by symlink ln -sf %{_datadir}/fonts/TTF/{Vera.ttf,VeraMono.ttf} %{buildroot}%{_datadir}/projectM/fonts/ @@ -201,10 +200,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/projectM-jack.desktop %endif %changelog +* Tue Dec 31 2019 Sérgio Basto - 3.1.1-0.8.rc7 +- v3.1.1-rc7 + * Thu Jul 25 2019 Fedora Release Engineering - 3.1.1-0.7.rc4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Thu Jun 13 2019 Sérgio Basto - 3.1.1-0.6.rc4.gitf2e0a32 +* Thu Jun 13 2019 Sérgio Basto - 3.1.1-0.6.rc4 - Update to rc4 final * Wed Apr 24 2019 Sérgio Basto - 3.1.1-0.5.rc3 diff --git a/projectm-3.1.0-autotools.patch b/projectm-3.1.0-autotools.patch index b6b2656..25b740c 100644 --- a/projectm-3.1.0-autotools.patch +++ b/projectm-3.1.0-autotools.patch @@ -1,12 +1,12 @@ diff --git a/configure.ac b/configure.ac -index b4f453d1..5e6261ec 100644 +index a305da9a..be3eb1fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,17 @@ --AC_INIT([projectM], [3.1.1-rc3], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/]) +-AC_INIT([projectM], [3.1.1-rc6], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) +AC_PREREQ([2.60]) -+AC_INIT([projectM],[3.1.1-rc3],[https://github.com/projectM-visualizer/projectm/issues/],[projectM],[https://github.com/projectM-visualizer/projectm/]) ++AC_INIT([projectM],[3.1.1-rc6],[https://github.com/projectM-visualizer/projectm/issues/],[projectM],[https://github.com/projectM-visualizer/projectm/]) + +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_AUX_DIR(.) @@ -23,7 +23,7 @@ index b4f453d1..5e6261ec 100644 # Check if we should disable rpath. # -@@ -110,7 +119,6 @@ AC_ARG_ENABLE([threading], +@@ -111,7 +120,6 @@ AC_ARG_ENABLE([threading], AS_HELP_STRING([--enable-threading], [multhreading]), [], [enable_threading=yes]) AS_IF([test "x$enable_threading" = "xyes" && ! test "$EMSCRIPTEN"], [ @@ -31,8 +31,8 @@ index b4f453d1..5e6261ec 100644 AX_PTHREAD([ AC_DEFINE([USE_THREADS], [1], [Define USE_THREADS]) LIBS="$LIBS $PTHREAD_LIBS $PTHREAD_CFLAGS" -@@ -216,10 +224,10 @@ AM_CONDITIONAL([ENABLE_PULSEAUDIO], [test "x$enable_pulseaudio" = "xyes"]) - AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"]) +@@ -230,10 +238,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"]) + AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"]) -my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits " @@ -46,7 +46,7 @@ index b4f453d1..5e6261ec 100644 diff --git a/src/projectM-test/Makefile.am b/src/projectM-test/Makefile.am -index 5c702143..cf2e22f4 100644 +index 3c9e2e10..afbac2e0 100644 --- a/src/projectM-test/Makefile.am +++ b/src/projectM-test/Makefile.am @@ -11,7 +11,6 @@ ${SDL_CFLAGS} diff --git a/sources b/sources index e1a1713..10ab430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libprojectM-3.1.1-rc4.tar.gz) = 9b50da8389657bd6cd3a99155a5f231a7f94eda1cfeb4140757cc4e74234c38cda2cf0c3a8dcb22fb9e9ef0f6d31cceca3f598dbd9db50d64cbb380c87ec4040 +SHA512 (libprojectM-3.1.1-rc7.tar.gz) = 241448a8887d84acfb0911bc11d3c65822d41244092d49e96695c465501f09ed8e16fc6fb88979bd357ee29ab50b4ccbd184a76aee20af09e6c44a8e17ad3b44