[xv/f27] (2 commits) ...add patch
by Leigh Scott
Summary of changes:
0061c1d... Hopefully fix rfbz#3044 (*)
4eb9572... add patch (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[nvidia-304xx-kmod] added patch for 4.15 kernel
by Nerijus Baliūnas
commit d8019d10fa18d53fca7c8010360e21111f97fe3e
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Tue Feb 13 16:01:02 2018 +0200
added patch for 4.15 kernel
4.15_kernel.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-304xx-kmod.spec | 7 ++++++-
2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/4.15_kernel.patch b/4.15_kernel.patch
new file mode 100644
index 0000000..fdac62f
--- /dev/null
+++ b/4.15_kernel.patch
@@ -0,0 +1,48 @@
+diff -ur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300
++++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200
+@@ -301,7 +301,11 @@
+ #else
+ irqreturn_t nv_kern_isr(int, void *);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ void nv_kern_rc_timer(unsigned long);
++#else
++void nv_kern_rc_timer(struct timer_list *t);
++#endif
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+ #endif
+@@ -2075,10 +2079,18 @@
+ }
+
+ void nv_kern_rc_timer(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ unsigned long data
++#else
++ struct timer_list *t
++#endif
+ )
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ nv_linux_state_t *nvl = (nv_linux_state_t *) data;
++#else
++ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
++#endif
+ nv_state_t *nv = NV_STATE_PTR(nvl);
+
+ NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
+@@ -3029,9 +3041,13 @@
+ return -1;
+
+ nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ init_timer(&nvl->rc_timer);
+ nvl->rc_timer.function = nv_kern_rc_timer;
+ nvl->rc_timer.data = (unsigned long) nv;
++#else
++ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
++#endif
+ nv->rc_timer_enabled = 1;
+ mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
+ nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index e47f611..89ee7b8 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,6 +23,7 @@ Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
Patch0: disable-warnings.patch
Patch1: 4.14_kernel.patch
+Patch2: 4.15_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ do
pushd nvidiapkg-${arch}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
popd
done
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 13 2018 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-4
+- patch for kernel-4.15
+
* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
- patch for kernel-4.14
6 years, 9 months
[nvidia-304xx-kmod/f26] added patch for 4.15 kernel
by Nerijus Baliūnas
commit e2932bb4631fbc4732331075db0ed5a2eeebe9a9
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Tue Feb 13 15:51:52 2018 +0200
added patch for 4.15 kernel
4.15_kernel.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-304xx-kmod.spec | 7 ++++++-
2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/4.15_kernel.patch b/4.15_kernel.patch
new file mode 100644
index 0000000..fdac62f
--- /dev/null
+++ b/4.15_kernel.patch
@@ -0,0 +1,48 @@
+diff -ur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300
++++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200
+@@ -301,7 +301,11 @@
+ #else
+ irqreturn_t nv_kern_isr(int, void *);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ void nv_kern_rc_timer(unsigned long);
++#else
++void nv_kern_rc_timer(struct timer_list *t);
++#endif
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+ #endif
+@@ -2075,10 +2079,18 @@
+ }
+
+ void nv_kern_rc_timer(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ unsigned long data
++#else
++ struct timer_list *t
++#endif
+ )
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ nv_linux_state_t *nvl = (nv_linux_state_t *) data;
++#else
++ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
++#endif
+ nv_state_t *nv = NV_STATE_PTR(nvl);
+
+ NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
+@@ -3029,9 +3041,13 @@
+ return -1;
+
+ nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ init_timer(&nvl->rc_timer);
+ nvl->rc_timer.function = nv_kern_rc_timer;
+ nvl->rc_timer.data = (unsigned long) nv;
++#else
++ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
++#endif
+ nv->rc_timer_enabled = 1;
+ mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
+ nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index e47f611..89ee7b8 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,6 +23,7 @@ Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
Patch0: disable-warnings.patch
Patch1: 4.14_kernel.patch
+Patch2: 4.15_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ do
pushd nvidiapkg-${arch}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
popd
done
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 13 2018 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-4
+- patch for kernel-4.15
+
* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
- patch for kernel-4.14
6 years, 9 months
[nvidia-304xx-kmod/f27] added patch for 4.15 kernel
by Nerijus Baliūnas
commit eb5d627add7be2f25bd06187ee4487da32f3f285
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Tue Feb 13 15:44:49 2018 +0200
added patch for 4.15 kernel
4.15_kernel.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
---
diff --git a/4.15_kernel.patch b/4.15_kernel.patch
new file mode 100644
index 0000000..fdac62f
--- /dev/null
+++ b/4.15_kernel.patch
@@ -0,0 +1,48 @@
+diff -ur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300
++++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200
+@@ -301,7 +301,11 @@
+ #else
+ irqreturn_t nv_kern_isr(int, void *);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ void nv_kern_rc_timer(unsigned long);
++#else
++void nv_kern_rc_timer(struct timer_list *t);
++#endif
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+ #endif
+@@ -2075,10 +2079,18 @@
+ }
+
+ void nv_kern_rc_timer(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ unsigned long data
++#else
++ struct timer_list *t
++#endif
+ )
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ nv_linux_state_t *nvl = (nv_linux_state_t *) data;
++#else
++ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
++#endif
+ nv_state_t *nv = NV_STATE_PTR(nvl);
+
+ NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
+@@ -3029,9 +3041,13 @@
+ return -1;
+
+ nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ init_timer(&nvl->rc_timer);
+ nvl->rc_timer.function = nv_kern_rc_timer;
+ nvl->rc_timer.data = (unsigned long) nv;
++#else
++ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
++#endif
+ nv->rc_timer_enabled = 1;
+ mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
+ nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
6 years, 9 months
[nvidia-304xx-kmod/f27] added patch for 4.15 kernel
by Nerijus Baliūnas
commit d451f3e483b4fbd0245db63b7306e43bb8004a9f
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Tue Feb 13 15:44:30 2018 +0200
added patch for 4.15 kernel
nvidia-304xx-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index e47f611..89ee7b8 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,6 +23,7 @@ Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
Patch0: disable-warnings.patch
Patch1: 4.14_kernel.patch
+Patch2: 4.15_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ do
pushd nvidiapkg-${arch}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
popd
done
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 13 2018 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-4
+- patch for kernel-4.15
+
* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
- patch for kernel-4.14
6 years, 9 months
[vdr-softhddevice-openglosd] Rebuilt for ffmpeg-3.5 git
by Martin Gansser
commit 4eb7faa047f0c96f38fffedee624fef12d1e088e
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Tue Feb 13 14:00:34 2018 +0100
Rebuilt for ffmpeg-3.5 git
vdr-softhddevice-openglosd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
index 8a8d3dc..6783a6a 100644
--- a/vdr-softhddevice-openglosd.spec
+++ b/vdr-softhddevice-openglosd.spec
@@ -32,7 +32,7 @@ BuildRequires: xcb-util-devel
BuildRequires: xcb-util-wm-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: mesa-libGL-devel
-BuildRequires: glm-devel
+BuildRequires: glm-devel >= 0.9.8.4-5
BuildRequires: glew-devel
BuildRequires: freetype-devel
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
6 years, 9 months
[libva-intel-driver] Update to 2.1.0
by Nicolas Chauvet
commit dc3c428926d3741f976636ef4ad6912972e9100b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 12 16:28:39 2018 +0100
Update to 2.1.0
libva-intel-driver.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 968dbf2..7b41833 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -1,7 +1,7 @@
#global _with_gen4asm 1
Name: libva-intel-driver
-Version: 2.0.0
+Version: 2.1.0
Release: 1%{?dist}
Summary: HW video decode support for Intel integrated graphics
License: MIT and EPL
@@ -73,6 +73,9 @@ gendiff . .prebuilt
%changelog
+* Mon Feb 12 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.0-1
+- Update to 2.1.0
+
* Mon Jan 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-1
- Update to 2.0.0
diff --git a/sources b/sources
index 04708c0..5714963 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9e1eaee8529259db5d335e483cc9e97 libva-intel-driver-2.0.0.tar.gz
+0199c16372519294724a35b508906ea6 libva-intel-driver-2.1.0.tar.gz
6 years, 9 months
[vidcutter] Vailidate appdata
by Leigh Scott
commit bec118fc28c6e4ecdf23fc83079c5e8301ea34c6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 11 09:46:00 2018 +0000
Vailidate appdata
vidcutter.spec | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/vidcutter.spec b/vidcutter.spec
index fe172ea..d003b8e 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -2,7 +2,7 @@
Name: vidcutter
Version: 5.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The simplest + fastest video cutter & joiner
License: GPLv3+
Url: http://vidcutter.ozmartians.com
@@ -12,6 +12,7 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: mpv-libs-devel
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
Requires: python3-qt5
Requires: ffmpeg
@@ -47,19 +48,7 @@ done
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/{appdata,metainfo}/*.appdata.xml
%files
%license LICENSE
@@ -77,6 +66,10 @@ fi
%{_datadir}/pixmaps/%{name}.svg
%changelog
+* Sun Feb 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 5.5.0-2
+- Vailidate appdata
+- Remove scriptlets
+
* Tue Feb 06 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.5.0-1
- Update to 5.5.0
- Dropped OpenGL_fix.patch
6 years, 9 months
[acoustid-fingerprinter] Remove Scriptlets
by Leigh Scott
commit 83bce6fd7ad77a53f5a73b91e71c7bfc0f841e96
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 11 09:10:57 2018 +0000
Remove Scriptlets
01-Fix-build-with-upcoming-Libav-10-release.patch | 20 ++++++----
02-CodecID.patch | 31 ++++++++++------
04-typo-warning.patch | 24 ++++++------
05-g++-6-char-cast.patch | 26 +++++++------
06-taglib.patch | 3 --
acoustid-fingerprinter.spec | 45 ++++++++++-------------
sources | 2 +-
7 files changed, 82 insertions(+), 69 deletions(-)
---
diff --git a/01-Fix-build-with-upcoming-Libav-10-release.patch b/01-Fix-build-with-upcoming-Libav-10-release.patch
index f85d7e4..2d99570 100644
--- a/01-Fix-build-with-upcoming-Libav-10-release.patch
+++ b/01-Fix-build-with-upcoming-Libav-10-release.patch
@@ -1,8 +1,14 @@
-Description: Fix build with upcoming Libav 10 release
- Drops support for pre-0.8 releases to reduce clutter, but those are over
- three years old now and no current distros carry them.
-Forwarded: https://bitbucket.org/acoustid/acoustid-fingerprinter/pull-request/3/fix-...
-Author: Anton Khirnov <anton(a)khirnov.net>
+From 2c778334a9fc2f0ccf9b1d7635c116bce6509748 Mon Sep 17 00:00:00 2001
+From: Anton Khirnov <anton(a)khirnov.net>
+Date: Sun, 17 Jul 2016 08:56:40 +0200
+Subject: [PATCH] Fix build with upcoming Libav 10 release
+
+Drops support for pre-0.8 releases to reduce clutter, but those are over
+three years old now and no current distros carry them.
+---
+ decoder.h | 84 ++++++++++++++++++++++++---------------------------------------
+ 1 file changed, 32 insertions(+), 52 deletions(-)
+
diff --git a/decoder.h b/decoder.h
index 028f58f..310fe2d 100644
--- a/decoder.h
@@ -31,7 +37,7 @@ index 028f58f..310fe2d 100644
class Decoder
{
public:
-@@ -67,8 +69,6 @@ public:
+@@ -67,8 +69,6 @@ class Decoder
static void initialize();
private:
@@ -40,7 +46,7 @@ index 028f58f..310fe2d 100644
uint8_t *m_buffer2;
std::string m_file_name;
std::string m_error;
-@@ -77,6 +77,7 @@ private:
+@@ -77,6 +77,7 @@ class Decoder
bool m_codec_open;
AVStream *m_stream;
static QMutex m_mutex;
diff --git a/02-CodecID.patch b/02-CodecID.patch
index 995766d..b3d29f2 100644
--- a/02-CodecID.patch
+++ b/02-CodecID.patch
@@ -1,13 +1,20 @@
-Description: Replace removed macros
- Rename CodecID to AVCodecID and replace AVCODEC_MAX_AUDIO_FRAME_SIZE
- with its last value 192000.
+From 5b3d32b26a7e4522b7c1b59b1d75367f2779c98d Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com>
+Date: Sun, 17 Jul 2016 08:57:45 +0200
+Subject: [PATCH] Replace removed macros
-Author: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com>
-Last-Update: <2014-05-13>
+Rename CodecID to AVCodecID and replace AVCODEC_MAX_AUDIO_FRAME_SIZE
+with its last value 192000.
+---
+ decoder.h | 2 +-
+ ffmpeg/audioconvert.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
---- acoustid-fingerprinter-0.6.orig/decoder.h
-+++ acoustid-fingerprinter-0.6/decoder.h
-@@ -116,7 +116,7 @@ inline Decoder::Decoder(const std::strin
+diff --git a/decoder.h b/decoder.h
+index 310fe2d..92156de 100644
+--- a/decoder.h
++++ b/decoder.h
+@@ -116,7 +116,7 @@ inline Decoder::Decoder(const std::string &file_name)
#endif
{
#ifdef HAVE_AV_AUDIO_CONVERT
@@ -16,9 +23,11 @@ Last-Update: <2014-05-13>
#endif
#if NEW_AVFRAME_API
---- acoustid-fingerprinter-0.6.orig/ffmpeg/audioconvert.h
-+++ acoustid-fingerprinter-0.6/ffmpeg/audioconvert.h
-@@ -75,11 +75,11 @@ int avcodec_channel_layout_num_channels(
+diff --git a/ffmpeg/audioconvert.h b/ffmpeg/audioconvert.h
+index 2b28e2e..69c0db2 100644
+--- a/ffmpeg/audioconvert.h
++++ b/ffmpeg/audioconvert.h
+@@ -75,11 +75,11 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout);
/**
* Guess the channel layout
* @param nb_channels
diff --git a/04-typo-warning.patch b/04-typo-warning.patch
index 885782e..d7a65c1 100644
--- a/04-typo-warning.patch
+++ b/04-typo-warning.patch
@@ -1,15 +1,17 @@
-Description: Fix typo in warning message
- Patch found in version 0.6-4.
-Author: Petter Reinholdtsen <pere(a)hungry.com>
-Origin: debian
-Forwarded: not-needed
-Origin: https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/fb80fb843fd...
-Reviewed-By: Petter Reinholdtsen <pere(a)hungry.com>
-Last-Update: 2016-07-16
+From 6cb95c67cd9699fb3d703451eb1c4bcabc96e25f Mon Sep 17 00:00:00 2001
+From: Wieland Hoffmann <themineo+bb(a)gmail.com>
+Date: Tue, 5 Nov 2013 12:08:52 +0000
+Subject: [PATCH] Change 'Submittion' to 'Submission' in a warning message
---- acoustid-fingerprinter-0.6.orig/fingerprinter.cpp
-+++ acoustid-fingerprinter-0.6/fingerprinter.cpp
-@@ -261,7 +261,7 @@ void Fingerprinter::onRequestFinished(QN
+---
+ fingerprinter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fingerprinter.cpp b/fingerprinter.cpp
+index db03313..940a70b 100644
+--- a/fingerprinter.cpp
++++ b/fingerprinter.cpp
+@@ -261,7 +261,7 @@ void Fingerprinter::onRequestFinished(QNetworkReply *reply)
stop = true;
}
else {
diff --git a/05-g++-6-char-cast.patch b/05-g++-6-char-cast.patch
index 2d31d03..743af42 100644
--- a/05-g++-6-char-cast.patch
+++ b/05-g++-6-char-cast.patch
@@ -1,15 +1,19 @@
-Description: Fix build failure on gcc 6
- Array initializers for a char array fail for constants > 128
- on platforms where char is signed. Cast to fix it.
-Author: Petter Reinholdtsen <pere(a)debian.org>
-Bug-Debian: https://bugs.debian.org/811732
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere(a)debian.org>
-Last-Update: 2016-07-16
+From 632e87969c3a5562a5d4842b03613267ba6236b2 Mon Sep 17 00:00:00 2001
+From: Petter Reinholdtsen <pere(a)debian.org>
+Date: Sun, 17 Jul 2016 08:59:10 +0200
+Subject: [PATCH] Fix build failure on gcc 6
---- acoustid-fingerprinter-0.6.orig/gzip.cpp
-+++ acoustid-fingerprinter-0.6/gzip.cpp
-@@ -23,12 +23,12 @@ inline unsigned long calculateCrc32(cons
+Array initializers for a char array fail for constants > 128
+on platforms where char is signed. Cast to fix it.
+---
+ gzip.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gzip.cpp b/gzip.cpp
+index 2aeaad3..35ccf31 100644
+--- a/gzip.cpp
++++ b/gzip.cpp
+@@ -23,12 +23,12 @@ inline unsigned long calculateCrc32(const QByteArray &data)
QByteArray gzipCompress(const QByteArray &data)
{
const char header[10] = {
diff --git a/06-taglib.patch b/06-taglib.patch
index efebc91..559265c 100644
--- a/06-taglib.patch
+++ b/06-taglib.patch
@@ -36,6 +36,3 @@ index 76b83ac..5a985f9 100644
mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
else(TAGLIBCONFIG_EXECUTABLE)
---
-2.7.4.1.g5468f9e
-
diff --git a/acoustid-fingerprinter.spec b/acoustid-fingerprinter.spec
index b319b34..fbf4d2a 100644
--- a/acoustid-fingerprinter.spec
+++ b/acoustid-fingerprinter.spec
@@ -1,19 +1,20 @@
Name: acoustid-fingerprinter
Version: 0.6
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Music AcoustID fingerprinting application
License: GPLv2+
-URL: http://acoustid.org/fingerprinter
-Source: https://github.com/downloads/lalinsky/%{name}/%{name}-%{version}.tar.gz
-Patch0: 01-Fix-build-with-upcoming-Libav-10-release.patch
-Patch1: 02-CodecID.patch
+URL: https://github.com/acoustid/%{name}
+Source: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0: %{url}/commit/2c778334a9fc2f0ccf9b1d7635c116bce6509748.patch#/01-Fix-build-with-upcoming-Libav-10-release.patch
+Patch1: %{url}/commit/5b3d32b26a7e4522b7c1b59b1d75367f2779c98d.patch#/02-CodecID.patch
Patch2: 03-pkg-config.patch
-Patch3: 04-typo-warning.patch
-Patch4: 05-g++-6-char-cast.patch
-Patch5: 06-taglib.patch
+Patch3: %{url}/commit/6cb95c67cd9699fb3d703451eb1c4bcabc96e25f.patch#/04-typo-warning.patch
+Patch4: %{url}/commit/632e87969c3a5562a5d4842b03613267ba6236b2.patch#/05-g++-6-char-cast.patch
+Patch5: %{url}/commit/681ef059e4bdb0a9b1a073d6cbb9bb54e993fef9.patch#/06-taglib.patch
-BuildRequires: cmake
+BuildRequires: cmake3
+BuildRequires: ninja-build
BuildRequires: qt4-devel
BuildRequires: ffmpeg-devel
BuildRequires: taglib-devel
@@ -34,13 +35,13 @@ track title, artist name, album name, etc.
%autosetup -p1
%build
-%cmake -DCMAKE_BUILD_TYPE=Debug
+%cmake3 -DCMAKE_BUILD_TYPE=Debug -GNinja
# removing the -O3 optimization flag for the release building type
sed -i "s/-O3 -DNDEBUG//g" CMakeCache.txt
-%make_build
+%ninja_build
%install
-%make_install
+%ninja_install
install -d -m755 %{buildroot}%{_datadir}/applications
@@ -52,18 +53,6 @@ desktop-file-install \
install -p -D -m 0644 images/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc CHANGES.txt
%license COPYING.txt
@@ -73,6 +62,12 @@ fi
%changelog
+* Sun Feb 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6-15
+- Remove Scriptlets
+- Switch URL and Source to github
+- Use upstream patches
+- Use ninja to build
+
* Wed Jan 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6-14
- Rebuilt for ffmpeg-3.5 git
@@ -152,6 +147,6 @@ fi
- update to 0.5
- minor spec cleaning
-* Thu Nov 18 2011 Ismael Olea <ismael(a)olea.org> - 0.4-1
+* Fri Nov 18 2011 Ismael Olea <ismael(a)olea.org> - 0.4-1
- first version for Fedora
diff --git a/sources b/sources
index cf1df7a..0afc429 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14e2e797ea09474a8862d200234f5e6b acoustid-fingerprinter-0.6.tar.gz
+712732ad622bddf8948e9b4d90100bd4 acoustid-fingerprinter-0.6.tar.gz
6 years, 9 months
[ffmpeg] Update to 20180211git
by Leigh Scott
commit de84226ba0b80ae9a8f9bc1d6472494264cc0834
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 11 08:06:11 2018 +0000
Update to 20180211git
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 896ac3e..405b666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ffmpeg-*.tar.xz
ffmpeg-*.rpm
/ffmpeg-20180116.tar.bz2
+/ffmpeg-20180211.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d3ac746..8dfcfa3 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20180116
+%global date 20180211
#global rel rc1
# Cuda and others are only available on some arches
@@ -75,7 +75,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.5
-Release: 0.2.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.3.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -407,6 +407,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Feb 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-0.3.20180211git
+- Update to 20180211git
+
* Fri Jan 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-0.2.20180116git
- Rebuild for new libcdio and libvpx versions
diff --git a/sources b/sources
index 16fbe56..19d034b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-387130b290229656febfe3a8f2d2239f ffmpeg-20180116.tar.bz2
+abe62958209357f45fda48e596df4a36 ffmpeg-20180211.tar.bz2
6 years, 9 months
