[qmmp-plugins-freeworld/el7] Fix Changelog
by Antonio
commit dd95c4578ff5aa03af3f8fbc3fc3f8cb2ab7e4ea
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 23:03:24 2018 +0100
Fix Changelog
qmmp-plugins-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index 11feb9a..0efa36c 100755
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -121,7 +121,7 @@ sed -i \
%changelog
* Wed Nov 14 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 0.8.8-2
-- Rebuild for ffmpeg-3.3.8 on el7
+- Rebuild for ffmpeg-3.4.5 on el7
- Use CMake3
- Uncheck legacy ffmpeg
- Fix opus detection
5 years, 11 months
[qmmp-plugins-freeworld/el7] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 32e2b4e0b6daedf13d86f1de8988e47fcafa2405
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 23:02:14 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
qmmp-plugins-freeworld.spec | 60 +++++++++++++--------------
qmmp-plugins-freeworld_fix_opus_version.patch | 11 +++++
2 files changed, 39 insertions(+), 32 deletions(-)
---
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index 97a3386..11feb9a 100755
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,27 +1,27 @@
Name: qmmp-plugins-freeworld
Version: 0.8.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
-
-Group: Applications/Multimedia
License: GPLv2+
URL: http://qmmp.ylsoftware.com/
-Source: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2
-Source2: qmmp-filter-provides.sh
+Source0: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2
+Source1: qmmp-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Fix opus detection
+Patch0: %{name}_fix_opus_version.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: ffmpeg-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel
+BuildRequires: opus-devel >= 1.0.2
BuildRequires: qt-devel >= 4.3
BuildRequires: libmms-devel
BuildRequires: taglib-devel libcurl-devel
-#BuildRequires: qmmp%{?_isa} = %{version}
-#Requires: qmmp%{?_isa} = %{version}
+
+Requires: qmmp%{?_isa} = %{version}
%description
Qmmp is an audio-player, written with help of Qt library.
@@ -30,8 +30,8 @@ and also the mplayer plugin for video playback.
%prep
-%setup -q -n qmmp-%{version}
-cp %{SOURCE2} .
+%autosetup -p 1 -n qmmp-%{version}
+cp -p %{SOURCE1} .
chmod +x qmmp-filter-provides.sh
# adjust includes for the header move in latest ffmpeg
sed -i \
@@ -46,8 +46,9 @@ sed -i \
%build
# the plugin groups, as separated by newlines, are:
# Transport, Input, Output, Effect, Visual, General, File Dialogs
-%cmake \
+%cmake3 -Wno-dev \
-D USE_CURL:BOOL=FALSE \
+ -D USE_FFMPEG_LEGACY:BOOL=FALSE \
\
-D USE_FLAC:BOOL=FALSE \
-D USE_VORBIS:BOOL=FALSE \
@@ -92,30 +93,24 @@ sed -i \
\
-D USE_QMMP_DIALOG:BOOL=FALSE \
\
- -D CMAKE_INSTALL_PREFIX=/usr \
+ -D CMAKE_INSTALL_PREFIX=%{_prefix} \
-D LIB_DIR=%{_lib} \
./
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Engines/mplayer
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/aac
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/ffmpeg
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Transports/mms
+%make_build VERBOSE=1 -C src/plugins/Engines/mplayer
+%make_build VERBOSE=1 -C src/plugins/Input/aac
+%make_build VERBOSE=1 -C src/plugins/Input/ffmpeg
+%make_build VERBOSE=1 -C src/plugins/Transports/mms
%install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install -C src/plugins/Engines/mplayer
-make DESTDIR=%{buildroot} install -C src/plugins/Input/aac
-make DESTDIR=%{buildroot} install -C src/plugins/Input/ffmpeg
-make DESTDIR=%{buildroot} install -C src/plugins/Transports/mms
-
-
-%clean
-rm -rf %{buildroot}
+%make_install -C src/plugins/Engines/mplayer
+%make_install -C src/plugins/Input/aac
+%make_install -C src/plugins/Input/ffmpeg
+%make_install -C src/plugins/Transports/mms
%files
-%defattr(0755,root,root,0755)
# there's only mplayer plugin now, so own the directory
%dir %{_libdir}/qmmp/Engines
%{_libdir}/qmmp/Engines/*.so
@@ -124,12 +119,13 @@ rm -rf %{buildroot}
%{_libdir}/qmmp/Transports/*.so
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
%changelog
+* Wed Nov 14 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 0.8.8-2
+- Rebuild for ffmpeg-3.3.8 on el7
+- Use CMake3
+- Uncheck legacy ffmpeg
+- Fix opus detection
+
* Mon Jan 02 2017 Karel Volný <kvolny(a)redhat.com> 0.8.8-1
- synchronised with EPEL7
- dropped MAD plugin, now in EPEL (rhbz#1409566)
diff --git a/qmmp-plugins-freeworld_fix_opus_version.patch b/qmmp-plugins-freeworld_fix_opus_version.patch
new file mode 100644
index 0000000..d13eb04
--- /dev/null
+++ b/qmmp-plugins-freeworld_fix_opus_version.patch
@@ -0,0 +1,11 @@
+--- a/src/plugins/Input/opus/CMakeLists.orig.txt 2015-08-25 13:39:05.000000000 +0200
++++ b/src/plugins/Input/opus/CMakeLists.txt 2018-11-14 12:16:44.092402418 +0100
+@@ -26,7 +26,7 @@
+ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+
+ # libopus and libopusfile
+-pkg_check_modules(OPUS opus>=1.0.2 opusfile>=0.2)
++pkg_check_modules (OPUS opus>=1.0.2)
+
+ include_directories(${OPUS_INCLUDE_DIRS} ${TAGLIB_INCLUDE_DIRS})
+ link_directories(${OPUS_LIBRARY_DIRS} ${TAGLIB_LIBRARY_DIRS})
5 years, 11 months
[mpd/el7] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit cb94fbc9ba5e4edfcea9d0f261a7eb8d500563aa
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 22:42:01 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
mpd-0.18.11.tar.xz.sig | Bin 543 -> 0 bytes
mpd-0.19.17.tar.xz.sig | Bin 543 -> 0 bytes
mpd-0.19.21.tar.xz.sig | Bin 0 -> 566 bytes
mpd.spec | 14 +++++++++-----
sources | 1 -
5 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/mpd-0.19.21.tar.xz.sig b/mpd-0.19.21.tar.xz.sig
new file mode 100644
index 0000000..22d161e
Binary files /dev/null and b/mpd-0.19.21.tar.xz.sig differ
diff --git a/mpd.spec b/mpd.spec
index 8f2f392..b59c5d3 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -17,10 +17,9 @@
Name: mpd
Epoch: 1
Version: 0.19.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
-Group: Applications/Multimedia
URL: http://www.musicpd.org/
Source0: http://www.musicpd.org/download/mpd/0.19/mpd-%{version}.tar.xz
@@ -105,10 +104,10 @@ sed -i -e 's@libsystemd-daemon@libsystemd@g' configure.ac
--enable-systemd-daemon \
--enable-zzip \
--enable-soxr
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
install -p -D -m 0644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
@@ -159,7 +158,8 @@ fi
%files
-%doc AUTHORS COPYING README
+%doc AUTHORS README
+%license COPYING
%{_bindir}/%{name}
%{_mandir}/man1/mpd.1*
%{_mandir}/man5/mpd.conf.5*
@@ -181,6 +181,10 @@ fi
%changelog
+* Fri Nov 23 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 1:0.19.21-2
+- Rebuild for ffmpeg-3.4.5 on el7
+- Rebuild for x264-0.148 on el7
+
* Mon May 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.19.21-1
- Update to 0.19.21
diff --git a/sources b/sources
index c74b324..fb4745c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
fc19f76b512bd471b6af5214965ff7c5 mpd-0.19.21.tar.xz
-160fd327b03d0ad754da97d99925c185 mpd-0.19.21.tar.xz.sig
5 years, 11 months
[nvidia-xconfig] Update to 415.22 release
by Leigh Scott
commit 8525a776f30621d6ce5e7465145033c6dff65acd
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 18:15:15 2018 +0000
Update to 415.22 release
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 9f85d7d..bcfcfa1 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -1,6 +1,6 @@
Name: nvidia-xconfig
Epoch: 3
-Version: 415.18
+Version: 415.22
Release: 1%{?dist}
Summary: NVIDIA X configuration file editor
@@ -49,6 +49,9 @@ mkdir -p %{buildroot}%{_sbindir}
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-1
+- Update to 415.22 release
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
diff --git a/sources b/sources
index e5ceeca..4f3151f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad3a90080117f729628b545debdb71bc nvidia-xconfig-415.18.tar.bz2
+4974dfa80a589bc8c5c684c1ffa3d75a nvidia-xconfig-415.22.tar.bz2
5 years, 11 months
[nvidia-settings] Update to 415.22 release
by Leigh Scott
commit 8701b4ce5728f3b589588359dc65b97208c8b5d4
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 18:13:45 2018 +0000
Update to 415.22 release
nvidia-settings.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 96405f8..da89bea 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -1,6 +1,6 @@
Name: nvidia-settings
Epoch: 3
-Version: 415.18
+Version: 415.22
Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
@@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-1
+- Update to 415.22 release
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
diff --git a/sources b/sources
index 044e756..3dbaeb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6cf694dbf733072d9ec86acf0212429 nvidia-settings-415.18.tar.bz2
+adf3ce19c2c815b918f00a0e8d575bb7 nvidia-settings-415.22.tar.bz2
5 years, 11 months
[nvidia-persistenced] Update to 415.22 release
by Leigh Scott
commit 80caae6a32f5f930a0fc93840a0b7120ed7c25b1
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 18:11:58 2018 +0000
Update to 415.22 release
.gitignore | 1 +
nvidia-persistenced.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f25159d..c0fcf74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ nvidia-persistenced-*.tar.gz
/nvidia-persistenced-410.73.tar.bz2
/nvidia-persistenced-410.78.tar.bz2
/nvidia-persistenced-415.18.tar.bz2
+/nvidia-persistenced-415.22.tar.bz2
diff --git a/nvidia-persistenced.spec b/nvidia-persistenced.spec
index 7b0d7ef..9654ac3 100644
--- a/nvidia-persistenced.spec
+++ b/nvidia-persistenced.spec
@@ -2,7 +2,7 @@
Name: nvidia-persistenced
Epoch: 3
-Version: 415.18
+Version: 415.22
Release: 1%{?dist}
Summary: Daemon for maintaining persistent driver state
@@ -74,6 +74,9 @@ chmod -x %{buildroot}%{_mandir}/man1/%{name}.1.*
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-1
+- Update to 415.22 release
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
diff --git a/sources b/sources
index fdd95d5..551868b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d26514c66394183f67345df3811b40e0 nvidia-persistenced-415.18.tar.bz2
+1ebc114bec2106b06658fc7bfe93feff nvidia-persistenced-415.22.tar.bz2
5 years, 11 months
[nvidia-modprobe] Update to 415.22 release
by Leigh Scott
commit 6097b0c8a490f56baa3c17fb258185ab0d3225a2
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 18:09:48 2018 +0000
Update to 415.22 release
.gitignore | 1 +
nvidia-modprobe.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41ee5d8..186d648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ nvidia-modprobe-*.tar.gz
/nvidia-modprobe-410.73.tar.bz2
/nvidia-modprobe-410.78.tar.bz2
/nvidia-modprobe-415.18.tar.bz2
+/nvidia-modprobe-415.22.tar.bz2
diff --git a/nvidia-modprobe.spec b/nvidia-modprobe.spec
index 1401dcb..ddf18b0 100644
--- a/nvidia-modprobe.spec
+++ b/nvidia-modprobe.spec
@@ -1,6 +1,6 @@
Name: nvidia-modprobe
Epoch: 3
-Version: 415.18
+Version: 415.22
Release: 1%{?dist}
Summary: Load the NVIDIA kernel module and create NVIDIA character device files
@@ -42,6 +42,9 @@ chmod -x %{buildroot}%{_mandir}/man1/nvidia-modprobe.1.*
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-1
+- Update to 415.22 release
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
diff --git a/sources b/sources
index 7253ced..847e5c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85a10140137982022197910d3651b7bb nvidia-modprobe-415.18.tar.bz2
+daefe888373c43f7ca8e35af8cef0847 nvidia-modprobe-415.22.tar.bz2
5 years, 11 months
[nvidia-kmod] Update to 415.22 release
by Leigh Scott
commit 2a2eda149de38ffb2be8218bf41edfc114234417
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 18:03:33 2018 +0000
Update to 415.22 release
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c1eb1bd..df14e5a 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 3
-Version: 415.18
+Version: 415.22
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -66,6 +66,9 @@ done
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-1
+- Update to 415.22 release
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
5 years, 11 months
[xorg-x11-drv-nvidia] Update to 415.22 release
by Leigh Scott
commit f7c536b4f9bbbcbd78f95f24338c44dabb7d5bf7
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Dec 7 17:53:22 2018 +0000
Update to 415.22 release
sources | 2 +-
xorg-x11-drv-nvidia.spec | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index d0b562e..2a54631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0928fa28b4805b95f41e6b74a463823c NVIDIA-Linux-x86_64-415.18.run
+e820512d0f02c2fe81c452612413adb7 NVIDIA-Linux-x86_64-415.22.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f0bf32b..e918d89 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -5,7 +5,7 @@
%global _alternate_dir %{_prefix}/lib/nvidia
%global _glvnd_libdir %{_libdir}/libglvnd
-%global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d
+%global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
%if 0%{?rhel}
@@ -14,14 +14,14 @@
%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
%endif
-%global debug_package %{nil}
-%global __strip /bin/true
+%global debug_package %{nil}
+%global __strip /bin/true
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 415.18
-Release: 1%{?dist}
+Version: 415.22
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -352,7 +352,7 @@ if [ -f %{_sysconfdir}/default/grub ] ; then
echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
else
for i in %{_dracutopts} ; do
- _has_string=$(echo ${GRUB_CMDLINE_LINUX} | fgrep -c $i)
+ _has_string=$(echo ${GRUB_CMDLINE_LINUX} | grep -F -c $i)
if [ x"$_has_string" = x0 ] ; then
GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}"
fi
@@ -480,6 +480,10 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-2
+- Update to 415.22 release
+- Fix some rpmlint warnings
+
* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
- Update to 415.18 release
5 years, 11 months
[zoneminder/el7: 2/2] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 6da22df55f3889afec772da454738680bfab77b9
Merge: 21980c0 39795b6
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 17:11:48 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
zoneminder.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
5 years, 11 months