[guvcview] add patch conditional for < f28
by Leigh Scott
commit a1772e3bd1e485211b0e3e2dc56a113b3eae47f3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Mar 11 15:44:24 2018 +0000
add patch conditional for < f28
guvcview.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 29727ea..5fb024b 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -61,8 +61,10 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
-#%patch0 -p1
-#%patch1 -p1
+%if ! %{with compat_ffmpeg}
+%patch0 -p1
+%patch1 -p1
+%endif
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
6 years, 7 months
[guvcview] Switch to compat-ffmpeg28 for F28
by Leigh Scott
commit 758326425e87f6e3c608f3f30845158713130c19
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Mar 11 15:35:00 2018 +0000
Switch to compat-ffmpeg28 for F28
guvcview.spec | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 01ac883..29727ea 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,6 +1,12 @@
+%if 0%{?fedora} > 27
+%bcond_without compat_ffmpeg
+%else
+%bcond_with compat_ffmpeg
+%endif
+
Name: guvcview
Version: 2.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
@@ -15,8 +21,11 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.10.0
BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(libpulse) >= 0.9.15
BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(libavcodec) >= 57.16
-BuildRequires: pkgconfig(libavutil)
+%if %{with compat_ffmpeg}
+BuildRequires: compat-ffmpeg28-devel
+%else
+BuildRequires: ffmpeg-devel
+%endif
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libusb-1.0)
@@ -52,12 +61,15 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
%build
+%if %{with compat_ffmpeg}
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
+%endif
%configure CC=gcc CXX=g++ --disable-debian-menu --disable-silent-rules --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -123,6 +135,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Sun Mar 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-6
+- Switch to compat-ffmpeg28 for F28
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.5-5
- Rebuilt for new ffmpeg snapshot
6 years, 7 months
[live555] new upstream release
by Alexandre Detiste
commit 9526c85ea4f4a991df36290568440aa55312d53c
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Mar 11 14:29:39 2018 +0100
new upstream release
live555.spec | 7 ++++---
sources | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/live555.spec b/live555.spec
index 803a707..4dacdbf 100644
--- a/live555.spec
+++ b/live555.spec
@@ -1,6 +1,6 @@
Name: live555
-Version: 2018.02.18
-Release: 2%{?dist}
+Version: 2018.02.28
+Release: 1%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
@@ -117,7 +117,8 @@ chmod +x %{buildroot}%{_libdir}/*.so*
%changelog
-* Sun Feb 25 2018 Alexandre Detiste <alexandre(a)detiste.be> - 2018.02.18-2
+* Sun Mar 11 2018 Alexandre Detiste <alexandre(a)detiste.be> - 2018.02.28-1
+- Update to 2018.02.28
- Remove workaround for 'xlocale.h' introduced in 2017.06.04-1,
not needed anymore
diff --git a/sources b/sources
index 4288d23..00cd3b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e070a0bf4b60af65717d09283ba0bbc live.2018.02.18.tar.gz
+4480fa0d559ea04d8a478fcfd0dc5dd2 live.2018.02.28.tar.gz
6 years, 7 months
[ndiswrapper-kmod] Patch for 4.15 kernel
by Leigh Scott
commit bf51a0fbd5d5d30761737aadbadac205401f6469
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Mar 11 09:56:05 2018 +0000
Patch for 4.15 kernel
ndiswrapper-4.15-kernel.patch | 199 ++++++++++++++++++++++++++++++++++++++++++
ndiswrapper-kmod.spec | 7 +-
2 files changed, 205 insertions(+), 1 deletion(-)
---
diff --git a/ndiswrapper-4.15-kernel.patch b/ndiswrapper-4.15-kernel.patch
new file mode 100644
index 0000000..8e87ece
--- /dev/null
+++ b/ndiswrapper-4.15-kernel.patch
@@ -0,0 +1,199 @@
+From: Seth Forshee <seth.forshee(a)canonical.com>
+Date: Wed, 13 Dec 2017 15:53:31 -0600
+Subject: [PATCH] Build fixes for Linux 4.15
+
+Fixes two build issues for 4.15:
+
+ - init_timer() was eliminated in 4.15, and all callers were
+ converted to using timer_setup(). The callback prototype has
+ also changed to pass a timer_list argument instead of callback
+ data, and from_timer() must be used to get to the object in
+ which the timer is embedded.
+
+ - usb_get_status() was changed to take an additional argument,
+ and usb_get_std_status() was added as a wrapper for callers to
+ use as a replacment. Call the wrapper in 4.15 and later.
+
+LP: #1737749
+---
+ driver/ntoskernel.c | 19 ++++++++++++++++++-
+ driver/usb.c | 10 ++++++++--
+ driver/wrapndis.c | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 54 insertions(+), 3 deletions(-)
+
+diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c
+index 4fe0dc1..156c688 100644
+--- a/driver/ntoskernel.c
++++ b/driver/ntoskernel.c
+@@ -77,7 +77,6 @@ u64 wrap_ticks_to_boot;
+ #if defined(CONFIG_X86_64)
+ static struct timer_list shared_data_timer;
+ struct kuser_shared_data kuser_shared_data;
+-static void update_user_shared_data_proc(unsigned long data);
+ #endif
+
+ WIN_SYMBOL_MAP("KeTickCount", &jiffies)
+@@ -91,7 +90,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info);
+ #endif
+
+ #if defined(CONFIG_X86_64)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void update_user_shared_data_proc(unsigned long data)
++#else
++static void update_user_shared_data_proc(struct timer_list *t)
++#endif
+ {
+ /* timer is supposed to be scheduled every 10ms, but bigger
+ * intervals seem to work (tried up to 50ms) */
+@@ -407,9 +410,15 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type,
+ InitializeListHead(&dh->wait_blocks);
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void timer_proc(unsigned long data)
+ {
+ struct wrap_timer *wrap_timer = (struct wrap_timer *)data;
++#else
++static void timer_proc(struct timer_list *t)
++{
++ struct wrap_timer *wrap_timer = from_timer(wrap_timer, t, timer);
++#endif
+ struct nt_timer *nt_timer;
+ struct kdpc *kdpc;
+
+@@ -452,9 +461,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type,
+ return;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ init_timer(&wrap_timer->timer);
+ wrap_timer->timer.data = (unsigned long)wrap_timer;
+ wrap_timer->timer.function = timer_proc;
++#else
++ timer_setup(&wrap_timer->timer, timer_proc, 0);
++#endif
+ wrap_timer->nt_timer = nt_timer;
+ #ifdef TIMER_DEBUG
+ wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC;
+@@ -2559,9 +2572,13 @@ int ntoskernel_init(void)
+ #if defined(CONFIG_X86_64)
+ memset(&kuser_shared_data, 0, sizeof(kuser_shared_data));
+ *((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ init_timer(&shared_data_timer);
+ shared_data_timer.function = update_user_shared_data_proc;
+ shared_data_timer.data = 0;
++#else
++ timer_setup(&shared_data_timer, update_user_shared_data_proc, 0);
++#endif
+ #endif
+ return 0;
+ }
+diff --git a/driver/usb.c b/driver/usb.c
+index 3e7021a..e55c2c6 100644
+--- a/driver/usb.c
++++ b/driver/usb.c
+@@ -750,6 +750,12 @@ static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev,
+ USBEXIT(return NT_URB_STATUS(nt_urb));
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++#define wrap_usb_get_status usb_get_status
++#else
++#define wrap_usb_get_status usb_get_std_status
++#endif
++
+ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ struct irp *irp)
+ {
+@@ -776,8 +782,8 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ return NT_URB_STATUS(nt_urb);
+ }
+ assert(status_req->transfer_buffer_length == sizeof(u16));
+- ret = usb_get_status(udev, type, status_req->index,
+- status_req->transfer_buffer);
++ ret = wrap_usb_get_status(udev, type, status_req->index,
++ status_req->transfer_buffer);
+ if (ret >= 0) {
+ assert(ret <= status_req->transfer_buffer_length);
+ status_req->transfer_buffer_length = ret;
+diff --git a/driver/wrapndis.c b/driver/wrapndis.c
+index 870e4c2..f653440 100644
+--- a/driver/wrapndis.c
++++ b/driver/wrapndis.c
+@@ -1093,9 +1093,15 @@ send_assoc_event:
+ EXIT2(return);
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void iw_stats_timer_proc(unsigned long data)
+ {
+ struct ndis_device *wnd = (struct ndis_device *)data;
++#else
++static void iw_stats_timer_proc(struct timer_list *t)
++{
++ struct ndis_device *wnd = from_timer(wnd, t, iw_stats_timer);
++#endif
+
+ ENTER2("%d", wnd->iw_stats_interval);
+ if (wnd->iw_stats_interval > 0) {
+@@ -1111,8 +1117,12 @@ static void add_iw_stats_timer(struct ndis_device *wnd)
+ return;
+ if (wnd->iw_stats_interval < 0)
+ wnd->iw_stats_interval *= -1;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ wnd->iw_stats_timer.data = (unsigned long)wnd;
+ wnd->iw_stats_timer.function = iw_stats_timer_proc;
++#else
++ timer_setup(&wnd->iw_stats_timer, iw_stats_timer_proc, 0);
++#endif
+ mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval);
+ }
+
+@@ -1124,9 +1134,15 @@ static void del_iw_stats_timer(struct ndis_device *wnd)
+ EXIT2(return);
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void hangcheck_proc(unsigned long data)
+ {
+ struct ndis_device *wnd = (struct ndis_device *)data;
++#else
++static void hangcheck_proc(struct timer_list *t)
++{
++ struct ndis_device *wnd = from_timer(wnd, t, hangcheck_timer);
++#endif
+
+ ENTER3("%d", wnd->hangcheck_interval);
+ if (wnd->hangcheck_interval > 0) {
+@@ -1147,8 +1163,12 @@ void hangcheck_add(struct ndis_device *wnd)
+ wnd->hangcheck_interval = hangcheck_interval * HZ;
+ if (wnd->hangcheck_interval < 0)
+ wnd->hangcheck_interval *= -1;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ wnd->hangcheck_timer.data = (unsigned long)wnd;
+ wnd->hangcheck_timer.function = hangcheck_proc;
++#else
++ timer_setup(&wnd->hangcheck_timer, hangcheck_proc, 0);
++#endif
+ mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval);
+ EXIT2(return);
+ }
+@@ -2138,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj,
+ wnd->dma_map_count = 0;
+ wnd->dma_map_addr = NULL;
+ wnd->nick[0] = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ init_timer(&wnd->hangcheck_timer);
++#else
++ timer_setup(&wnd->hangcheck_timer, NULL, 0);
++#endif
+ wnd->scan_timestamp = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ init_timer(&wnd->iw_stats_timer);
++#else
++ timer_setup(&wnd->iw_stats_timer, NULL, 0);
++#endif
+ wnd->iw_stats_interval = 10 * HZ;
+ wnd->ndis_pending_work = 0;
+ memset(&wnd->essid, 0, sizeof(wnd->essid));
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 101acec..fae04d5 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -13,7 +13,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.61
-Release: 5%{?pre}%{?dist}
+Release: 6%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -22,6 +22,7 @@ Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
Patch1: ndiswrapper-4.11-kernel.patch
Patch2: ndiswrapper-4.13-kernel.patch
+Patch3: ndiswrapper-4.15-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -55,6 +56,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
%patch0 -p1 -b .orig
%patch1 -p1 -b .orig
%patch2 -p2 -b .orig
+%patch3 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.61-6
+- Patch for 4.15 kernel
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.61-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 7 months
[kwave/f26] Update kwave to 17.12.3
by Sérgio M. Basto
Summary of changes:
ffcec40... Update kwave to 17.12.3 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
