commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2019-03-19 10:01:00 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new.28833 (New) Package is "hdjmod" Tue Mar 19 10:01:00 2019 rev:20 rq:686088 version:1.28 Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2018-06-20 15:33:42.336963222 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new.28833/hdjmod.changes 2019-03-19 10:01:03.11367 +0100 @@ -1,0 +2,6 @@ +Mon Mar 18 10:41:55 UTC 2019 - Michal Suchanek + +- Fix build with kernel 5.0: + * hdjmod_kernel_5.0.patch + +--- New: hdjmod_kernel_5.0.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.Zykx1u/_old 2019-03-19 10:01:04.795910538 +0100 +++ /var/tmp/diff_new_pack.Zykx1u/_new 2019-03-19 10:01:04.807910525 +0100 @@ -1,7 +1,7 @@ # # spec file for package hdjmod # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2017 Matthias Bach # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -60,6 +60,8 @@ Patch11:hdjmod_kernel_4.14.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_4.15.patch ma...@marix.org -- Fix build on kernel 4.15 and newer Patch12:hdjmod_kernel_4.15.patch +# Fix build with kernel 5.0 +Patch13:hdjmod_kernel_5.0.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -86,6 +88,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p2 set -- * mkdir source mv "$@" source/ ++ hdjmod_kernel_5.0.patch ++ diff -ur hdjmod-1.28.orig/source/bulk.c hdjmod-1.28/source/bulk.c --- hdjmod-1.28.orig/source/bulk.c 2019-03-18 11:22:52.220314382 +0100 +++ hdjmod-1.28/source/bulk.c 2019-03-18 11:40:25.665723290 +0100 @@ -622,7 +622,7 @@ case DJ_IOCTL_GET_VERSION: ioctl_trace_printk(KERN_INFO"%s() received IOCTL: DJ_IOCTL_GET_VERSION\n", __FUNCTION__); - access = access_ok(VERIFY_WRITE,ioctl_param, sizeof(u32)); + access = write_ok(ioctl_param, sizeof(u32)); if (access!=0) { value32p_user = (u32 __user *)ioctl_param; result = __put_user(driver_version,value32p_user); @@ -645,7 +645,7 @@ __FUNCTION__); /*verify that the address isn't in kernel mode*/ - access = access_ok(VERIFY_WRITE,ioctl_param,sizeof(u16)); + access = write_ok(ioctl_param,sizeof(u16)); if (access) { result = get_jogwheel_lock_status(ubulk, , 1, 0); if (result==0) { @@ -671,7 +671,7 @@ ioctl_trace_printk(KERN_INFO"%s() received IOCTL: DJ_IOCTL_SET_JOG_WHEEL_LOCK_SETTING\n",__FUNCTION__); /*verify that the address isn't in kernel mode*/ - access = access_ok(VERIFY_READ,ioctl_param,sizeof(u16)); + access = read_ok(ioctl_param,sizeof(u16)); if (access) { /*copy the usermode buffer to kernel mode*/ value16p_user = (u16 __user *)ioctl_param; @@ -696,7 +696,7 @@ ioctl_trace_printk(KERN_INFO"%s() received IOCTL: DJ_IOCTL_GET_JOG_WHEEL_SENSITIVITY\n",__FUNCTION__); /*verify that the address isn't in kernel mode */ - access = access_ok(VERIFY_WRITE,ioctl_param,sizeof(u16)); + access = write_ok(ioctl_param,sizeof(u16)); if (access) { result = get_jogwheel_sensitivity(ubulk, , 1, 0); if (result == 0) { @@ -722,7 +722,7 @@ ioctl_trace_printk(KERN_INFO"%s() received IOCTL: DJ_IOCTL_SET_JOG_WHEEL_SENSITIVITY\n",__FUNCTION__); /*verify that the address isn't in kernel mode*/ - access = access_ok(VERIFY_READ,ioctl_param,sizeof(u16)); + access = read_ok(ioctl_param,sizeof(u16)); if (access) { /*copy the usermode buffer to kernel mode*/ value16p_user = (u16 __user *)ioctl_param; @@ -749,7 +749,7 @@ __FUNCTION__); /*verify
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2018-06-20 15:33:06 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is "hdjmod" Wed Jun 20 15:33:06 2018 rev:19 rq:617785 version:1.28 Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2018-02-13 10:31:53.671707999 +0100 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2018-06-20 15:33:42.336963222 +0200 @@ -1,0 +2,5 @@ +Tue Jun 19 12:10:30 UTC 2018 - msucha...@suse.com + +- Use %{?linux_make_arch} when building kernel modules (boo#1098050). + +--- Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.QTGTCE/_old 2018-06-20 15:33:43.988903283 +0200 +++ /var/tmp/diff_new_pack.QTGTCE/_new 2018-06-20 15:33:43.992903137 +0200 @@ -29,7 +29,7 @@ %endif BuildRequires: libelf-devel Summary:Support for Hercules DJ Devices -License:GPL-2.0+ +License:GPL-2.0-or-later Group: System/Kernel Url: http://ts.hercules.com/ger/index.php?pg=view_files=17=62=177=1 Source0:hdjmod-%{version}.tar.bz2 @@ -95,14 +95,14 @@ for flavor in %flavors_to_build; do rm -rf obj/$flavor cp -r source obj/$flavor -make -C %{kernel_source $flavor} modules M=$PWD/obj/$flavor +make -C %{kernel_source $flavor} %{?linux_make_arch} modules M=$PWD/obj/$flavor done %install export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do -make -C %{kernel_source $flavor} modules_install M=$PWD/obj/$flavor +make -C %{kernel_source $flavor} %{?linux_make_arch} modules_install M=$PWD/obj/$flavor done %changelog
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2018-02-13 10:31:50 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is "hdjmod" Tue Feb 13 10:31:50 2018 rev:18 rq:575867 version:1.28 Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2017-11-27 22:17:52.683795578 +0100 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2018-02-13 10:31:53.671707999 +0100 @@ -1,0 +2,8 @@ +Fri Feb 10 15:00:06 UTC 2018 - ma...@marix.org + +- Added hdjmod_kernel_4.15.patch: Fixes build on Kernel 4.15 and + up. +- Removed accidentally added backup file from + hdjmod_fix_hotplug.patch + +--- New: hdjmod_kernel_4.15.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.OM0n5P/_old 2018-02-13 10:31:55.295649485 +0100 +++ /var/tmp/diff_new_pack.OM0n5P/_new 2018-02-13 10:31:55.299649340 +0100 @@ -1,7 +1,7 @@ # # spec file for package hdjmod # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2017 Matthias Bach# # All modifications and additions to the file contributed by third parties @@ -58,6 +58,8 @@ Patch10:hdjmod_fix_buffer_overrun_in_device_name_handling.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_4.14.patch ma...@marix.org -- Fix build on kernel 4.14 and newer Patch11:hdjmod_kernel_4.14.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_4.15.patch ma...@marix.org -- Fix build on kernel 4.15 and newer +Patch12:hdjmod_kernel_4.15.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -83,6 +85,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 set -- * mkdir source mv "$@" source/ ++ hdjmod_fix_hotplug.patch ++ 2811 lines (skipped) between /work/SRC/openSUSE:Factory/hdjmod/hdjmod_fix_hotplug.patch and /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod_fix_hotplug.patch ++ hdjmod_kernel_4.15.patch ++ From: Matthias Bach Date: 2018-02-10 15:00:00 +0100 Subject: Fix compile on kernel 4.15 Upstream: to be done The module no longer compiled on 4.15 diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/device.c2018-02-10 13:24:32.903039377 +0100 @@ -2373,7 +2373,11 @@ { int rc=-ENODEV; u16 devstatus; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + rc = usb_get_std_status(chip->dev, USB_RECIP_DEVICE, 0, ); +#else rc = usb_get_status(chip->dev, USB_RECIP_DEVICE, 0, ); +#endif if (rc >= 0) { rc = (rc > 0 ? 0 : -ENODEV); } diff -Naru hdjmod-1.28o/midi.c hdjmod-1.28/midi.c --- hdjmod-1.28o/midi.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/midi.c 2018-02-10 14:19:57.548542925 +0100 @@ -49,6 +49,9 @@ #ifdef CONFIG_COMPAT #include #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) +#include +#endif #include "djdevioctls.h" #include "device.h" #include "bulk.h" @@ -327,9 +330,16 @@ } /* called after transfers had been interrupted due to some USB error */ + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) +static void snd_hdjmidi_error_timer(struct timer_list *t) +{ + struct snd_hdjmidi *umidi = from_timer(umidi, t, error_timer); +#else static void snd_hdjmidi_error_timer(unsigned long data) { struct snd_hdjmidi *umidi = (struct snd_hdjmidi *)data; +#endif int i; for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) { @@ -887,10 +897,14 @@ spin_lock_init(>buffer_lock); snd_hdjmidi_output_initialize_tasklet(ep); #ifdef THROTTLE_MP3_RENDER +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + timer_setup(>render_delay_timer, midi_render_throttle_timer, 0); +#else init_timer(>render_delay_timer); ep->render_delay_timer.data = (unsigned long)ep; ep->render_delay_timer.function = midi_render_throttle_timer; -#endif +#endif /* LINUX_VERSION_CODE */ +#endif /* THROTTLE_MP3_RENDER */ for (i = 0; i < 0x10; ++i) if (ep_info->out_ep) { @@ -2479,10 +2493,14 @@ umidi->usb_protocol_ops = _hdjmidi_standard_ops; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + timer_setup(>error_timer, snd_hdjmidi_error_timer, 0); +#else init_timer(>error_timer); umidi->error_timer.function = snd_hdjmidi_error_timer; umidi->error_timer.data = (unsigned long)umidi; +#endif /* detect the endpoint(s) to use */
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2017-11-27 22:17:52 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is "hdjmod" Mon Nov 27 22:17:52 2017 rev:17 rq:545757 version:1.28 Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2017-07-02 13:38:43.102491317 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2017-11-27 22:17:52.683795578 +0100 @@ -1,0 +2,6 @@ +Sun Nov 26 19:44:30 UTC 2017 - ma...@marix.org + +- Added hdjmod_kernel_4.14.patch: Fixes build on Kernel 4.14 and + up. + +--- New: hdjmod_kernel_4.14.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.8B156O/_old 2017-11-27 22:17:53.507765672 +0100 +++ /var/tmp/diff_new_pack.8B156O/_new 2017-11-27 22:17:53.511765526 +0100 @@ -56,6 +56,8 @@ Patch9: hdjmod_kernel_4.11.patch # PATCH-FIX-UPSTREAM hdjmod_fix_buffer_overrun_in_device_name_handling.patch ma...@marix.org -- Fix build on kernel 4.11 and newer Patch10:hdjmod_fix_buffer_overrun_in_device_name_handling.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_4.14.patch ma...@marix.org -- Fix build on kernel 4.14 and newer +Patch11:hdjmod_kernel_4.14.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -80,6 +82,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 set -- * mkdir source mv "$@" source/ ++ hdjmod_kernel_4.14.patch ++ From: Matthias BachDate: 2017-11-26 20:45:00 +0100 Subject: Fix compile on kernel 4.14 Upstream: to be done The module no longer compiled on 4.14 diff -Naru hdjmod-1.28o/bulk.c hdjmod-1.28/bulk.c --- hdjmod-1.28o/bulk.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/bulk.c 2017-11-26 20:41:31.941557776 +0100 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/device.c2017-11-26 20:38:50.262807031 +0100 @@ -29,6 +29,7 @@ #include /* For LINUX_VERSION_CODE */ #include #include +#include #include #include #include diff -Naru hdjmod-1.28o/midicapture.c hdjmod-1.28/midicapture.c --- hdjmod-1.28o/midicapture.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/midicapture.c 2017-11-26 20:42:47.007150108 +0100 @@ -27,6 +27,7 @@ #include /* For LINUX_VERSION_CODE */ #include #include +#include #include #include #include diff -Naru hdjmod-1.28o/midirender.c hdjmod-1.28/midirender.c --- hdjmod-1.28o/midirender.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/midirender.c2017-11-26 20:43:18.906131711 +0100 @@ -26,6 +26,7 @@ #include /* For LINUX_VERSION_CODE */ #include #include +#include #include #include #include
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2017-07-02 13:38:41 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is "hdjmod" Sun Jul 2 13:38:41 2017 rev:16 rq:507550 version:1.28 Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2014-09-17 10:11:07.0 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2017-07-02 13:38:43.102491317 +0200 @@ -1,0 +2,12 @@ +Sat Jul 1 18:41:37 UTC 2017 - ma...@marix.org + +- Added hdjmod_fix_buffer_overrun_in_device_name_handling.patch: + Fixes a potential buffer overrun in device name handling. + +--- +Fri May 26 17:45:41 UTC 2017 - ma...@marix.org + +- Added hdjmod_kernel_4.11.patch: Fixes build on Kernel 4.11 and + up. + +--- New: hdjmod_fix_buffer_overrun_in_device_name_handling.patch hdjmod_kernel_4.11.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.2miaqn/_old 2017-07-02 13:38:43.850385851 +0200 +++ /var/tmp/diff_new_pack.2miaqn/_new 2017-07-02 13:38:43.854385288 +0200 @@ -1,8 +1,8 @@ # # spec file for package hdjmod # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2008-2014 Matthias Bach+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2008-2017 Matthias Bach # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ %else BuildRequires: %kernel_module_package_buildreqs %endif +BuildRequires: libelf-devel Summary:Support for Hercules DJ Devices License:GPL-2.0+ Group: System/Kernel @@ -51,6 +52,10 @@ Patch7: hdjmod_kernel_3.7.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_3.16.patch ma...@marix.org -- Fix build on kernel 3.16 and newer Patch8: hdjmod_kernel_3.16.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_4.11.patch ma...@marix.org -- Fix build on kernel 4.11 and newer +Patch9: hdjmod_kernel_4.11.patch +# PATCH-FIX-UPSTREAM hdjmod_fix_buffer_overrun_in_device_name_handling.patch ma...@marix.org -- Fix build on kernel 4.11 and newer +Patch10:hdjmod_fix_buffer_overrun_in_device_name_handling.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -73,6 +78,8 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 set -- * mkdir source mv "$@" source/ ++ hdjmod_fix_buffer_overrun_in_device_name_handling.patch ++ From: Matthias Bach Date: 20117-07-01 20:40:00 +0200 Subject: Fix a buffer overrun Upstream: to be done The code messed up handling of the offset when calculating the maximum number of bytes it can copy into a buffer at a certain offset. diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/device.c2017-07-01 20:39:07.129497940 +0200 @@ -1769,7 +1769,7 @@ memset(shortname,0,sizeof(shortname)); snprintf(shortname,sizeof(shortname)-1,"Hercules "); strncpy(shortname+strlen(shortname), - card->shortname,sizeof(shortname)+strlen(shortname)-1); + card->shortname,sizeof(shortname)-strlen(shortname)-1); memset(card->shortname,0,sizeof(card->shortname)); strncpy(card->shortname,shortname,sizeof(card->shortname)-1); } ++ hdjmod_kernel_4.11.patch ++ From: Matthias Bach Date: 20117-05-26 20:20:00 +0200 Subject: Fix compile on kernel 4.11 Upstream: to be done The module no longer compiled on 4.11 diff -Naru hdjmod-1.28o/bulk.c hdjmod-1.28/bulk.c --- hdjmod-1.28o/bulk.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/bulk.c 2017-05-26 20:00:46.941268724 +0200 @@ -37,6 +37,9 @@ #if ( LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) ) #include #endif +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ) +#include +#endif #include #include #include diff -Naru hdjmod-1.28o/configuration_manager.c hdjmod-1.28/configuration_manager.c --- hdjmod-1.28o/configuration_manager.c2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/configuration_manager.c 2017-05-26 20:02:11.079953245 +0200 @@ -29,6 +29,9 @@ #if ( LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) ) #include #endif +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ) +#include +#endif #include #include #include
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2014-09-17 10:11:06 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is hdjmod Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2012-12-28 15:01:20.0 +0100 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2014-09-17 10:11:07.0 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 20:47:24 UTC 2014 - ma...@marix.org + +- Fixed build on kernel 3.16 + The required patch is hdjmod_kernel_3.16.patch + +--- New: hdjmod_kernel_3.16.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.xOtFFQ/_old 2014-09-17 10:11:08.0 +0200 +++ /var/tmp/diff_new_pack.xOtFFQ/_new 2014-09-17 10:11:08.0 +0200 @@ -1,8 +1,8 @@ # # spec file for package hdjmod # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright 2008 Matthias Bach ma...@marix.org +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008-2014 Matthias Bach ma...@marix.org # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,10 +49,8 @@ Patch6: hdjmod_kernel_3.6.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_3.7.patch ma...@marix.org -- Fix build on kernel 3.7 and newer Patch7: hdjmod_kernel_3.7.patch - -# The package triggers RPM-Lint warning because it misses requires to the proper kernel packages -# These requires should be added by the kernel_module_package macro, so, therefore the are not -# fixed in this package. See also https://bugzilla.novell.com/show_bug.cgi?id=479141. +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.16.patch ma...@marix.org -- Fix build on kernel 3.16 and newer +Patch8: hdjmod_kernel_3.16.patch %suse_kernel_module_package -p%_sourcedir/preamble @@ -74,6 +72,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 set -- * mkdir source mv $@ source/ ++ hdjmod_kernel_3.16.patch ++ From: Matthias Bach ma...@marix.org Date: 2014-07-26 23:30:00 +0200 Subject: Fix compile on kernel 3.16 Upstream: to be done The module no longer compiled on 3.16 due to API changes in ALSA. diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2014-07-25 22:38:52.985186212 +0200 +++ hdjmod-1.28/device.c2014-07-25 22:44:05.297761993 +0200 @@ -1660,7 +1660,13 @@ /* let the kernel option override custom id */ strncpy(card_id,id[idx],sizeof(card_id)-1); } -#if ( LINUX_VERSION_CODE = KERNEL_VERSION(2,6,30) ) +#if ( LINUX_VERSION_CODE = KERNEL_VERSION(3,16,0) ) + err = snd_card_new(dev-dev, index[idx], card_id/*id[idx]*/, THIS_MODULE, 0, card ); + if (err) { + snd_printk(KERN_WARNING snd_hdj_chip_create(): cannot create card instance %d\n, idx); + return err; + } +#elif ( LINUX_VERSION_CODE = KERNEL_VERSION(2,6,30) ) err = snd_card_create(index[idx], card_id/*id[idx]*/, THIS_MODULE, 0, card ); if (err) { snd_printk(KERN_WARNING snd_hdj_chip_create(): cannot create card instance %d\n, idx); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2012-12-28 15:01:18 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is hdjmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2012-10-23 19:37:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2012-12-28 15:01:20.0 +0100 @@ -1,0 +2,5 @@ +Sun Dec 23 16:47:42 UTC 2012 - ma...@marix.org + +- Fixed build on kernel 3.7 + +--- New: hdjmod_kernel_3.7.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.TJRRFw/_old 2012-12-28 15:01:21.0 +0100 +++ /var/tmp/diff_new_pack.TJRRFw/_new 2012-12-28 15:01:21.0 +0100 @@ -47,6 +47,8 @@ Patch5: hdjmod_fix_hotplug.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_3.6.patch [bnc#783848] ma...@marix.org -- Fix build on kernel 3.6 and newer Patch6: hdjmod_kernel_3.6.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.7.patch ma...@marix.org -- Fix build on kernel 3.7 and newer +Patch7: hdjmod_kernel_3.7.patch # The package triggers RPM-Lint warning because it misses requires to the proper kernel packages # These requires should be added by the kernel_module_package macro, so, therefore the are not @@ -71,6 +73,7 @@ %patch1 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 set -- * mkdir source mv $@ source/ ++ hdjmod_kernel_3.6.patch ++ --- /var/tmp/diff_new_pack.TJRRFw/_old 2012-12-28 15:01:21.0 +0100 +++ /var/tmp/diff_new_pack.TJRRFw/_new 2012-12-28 15:01:21.0 +0100 @@ -5,7 +5,7 @@ /* Try to allocate a netlink socket minimizing the risk of collision, * by starting at the max unit number and counting down */ for (unit=MAX_LINKS-1;unitMIN_NETLINK_UNIT;unit--) { -+#if ( LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) ) ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) + nl_sk = netlink_kernel_create( + init_net, + unit, @@ -27,7 +27,7 @@ return NULL; } -+#if ( LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) ) ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) + nlh = nlmsg_put(skb, target_pid, seq, t, size, flags); + if(!nlh) { + if (skb) { ++ hdjmod_kernel_3.7.patch ++ diff -aru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2012-12-23 17:41:13.11160 +0100 +++ hdjmod-1.28/device.c2012-12-23 17:42:33.115898437 +0100 @@ -2397,7 +2397,9 @@ nl_sk = netlink_kernel_create( init_net, unit, +#if LINUX_VERSION_CODE KERNEL_VERSION(3,7,0) THIS_MODULE, +#endif NULL); #else nl_sk = netlink_kernel_create( Nur in hdjmod-1.28: .device.c.swp. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2012-10-23 19:37:22 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is hdjmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2012-04-12 09:26:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2012-10-23 19:37:24.0 +0200 @@ -1,0 +2,5 @@ +Tue Oct 16 19:57:00 UTC 2012 - ma...@marix.org + +- Fixed build on kernel 3.6 + +--- New: hdjmod_kernel_3.6.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.b9OUdZ/_old 2012-10-23 19:37:28.0 +0200 +++ /var/tmp/diff_new_pack.b9OUdZ/_new 2012-10-23 19:37:28.0 +0200 @@ -45,6 +45,8 @@ Patch4: hdjmod_kernel_2.6.39.patch # PATCH-FIX-UPSTREAM hdjmod_fix_hotplug.patch [bnc#746358] ma...@marix.org -- Don't load on hotplug of devices from other vendors Patch5: hdjmod_fix_hotplug.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.6.patch [bnc#783848] ma...@marix.org -- Fix build on kernel 3.6 and newer +Patch6: hdjmod_kernel_3.6.patch # The package triggers RPM-Lint warning because it misses requires to the proper kernel packages # These requires should be added by the kernel_module_package macro, so, therefore the are not @@ -68,6 +70,7 @@ %endif %patch1 -p1 %patch5 -p1 +%patch6 -p1 set -- * mkdir source mv $@ source/ ++ hdjmod_kernel_3.6.patch ++ diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2009-01-27 15:25:50.0 +0100 +++ hdjmod-1.28/device.c2012-10-16 21:52:40.0 +0200 @@ -2393,6 +2393,13 @@ /* Try to allocate a netlink socket minimizing the risk of collision, * by starting at the max unit number and counting down */ for (unit=MAX_LINKS-1;unitMIN_NETLINK_UNIT;unit--) { +#if ( LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) ) + nl_sk = netlink_kernel_create( + init_net, + unit, + THIS_MODULE, + NULL); +#else nl_sk = netlink_kernel_create( #if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,24) init_net, @@ -2404,6 +2411,7 @@ NULL, #endif THIS_MODULE); +#endif if (nl_sk!=NULL) { netlink_unit = unit; return 0; @@ -2469,6 +2477,20 @@ return NULL; } +#if ( LINUX_VERSION_CODE = KERNEL_VERSION(3,6,0) ) + nlh = nlmsg_put(skb, target_pid, seq, t, size, flags); + if(!nlh) { + if (skb) { + kfree_skb(skb); + } + return NULL; + } + data = nlmsg_data(nlh); + if (size 0) { + memcpy(data, payload, size); + } + return skb; +#else nlh = NLMSG_PUT(skb, target_pid, seq, t, size); nlh-nlmsg_flags = flags; data = NLMSG_DATA(nlh); @@ -2482,6 +2504,7 @@ kfree_skb(skb); } return NULL; +#endif } int register_for_netlink(struct snd_hdj_chip* chip, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2012-03-26 12:17:57 Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) Package is hdjmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes2011-09-23 02:02:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2012-03-26 12:18:10.0 +0200 @@ -1,0 +2,6 @@ +Tue Mar 13 21:33:50 UTC 2012 - ma...@marix.org + +- Fixed USB hotplugging + Previously the module also loaded for devices of other vendors. + +--- New: hdjmod_fix_hotplug.patch Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.zPg3RS/_old 2012-03-26 12:18:13.0 +0200 +++ /var/tmp/diff_new_pack.zPg3RS/_new 2012-03-26 12:18:13.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package hdjmod # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright 2008 Matthias Bach ma...@marix.org # # All modifications and additions to the file contributed by third parties @@ -44,6 +44,8 @@ Patch3: hdjmod_kernel_2.6.37.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_2.6.39.patch ma...@marix.org -- Fix build on kernel 2.6.39 and newer Patch4: hdjmod_kernel_2.6.39.patch +# PATCH-FIX-UPSTREAM hdjmod_fix_hotplug.patch [bnc#746358] ma...@marix.org -- Don't load on hotplug of devices from other vendors +Patch5: hdjmod_fix_hotplug.patch # The package triggers RPM-Lint warning because it misses requires to the proper kernel packages # These requires should be added by the kernel_module_package macro, so, therefore the are not @@ -66,6 +68,7 @@ %patch4 -p1 %endif %patch1 -p1 +%patch5 -p1 set -- * mkdir source mv $@ source/ ++ hdjmod_fix_hotplug.patch ++ 2822 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at Thu Aug 25 15:05:29 CEST 2011. --- hdjmod/hdjmod.changes 2011-05-30 22:07:10.0 +0200 +++ /mounts/work_src_done/STABLE/hdjmod/hdjmod.changes 2011-08-03 11:01:06.0 +0200 @@ -1,0 +2,6 @@ +Wed Aug 3 09:01:04 UTC 2011 - cfarr...@novell.com + +- license update: GPL-2.0+ + Specify the license more accurately using the appropriate syntax + +--- calling whatdependson for head-i586 Other differences: -- ++ hdjmod.spec ++ --- /var/tmp/diff_new_pack.hwu3l4/_old 2011-08-25 15:05:13.0 +0200 +++ /var/tmp/diff_new_pack.hwu3l4/_new 2011-08-25 15:05:13.0 +0200 @@ -20,8 +20,8 @@ Name: hdjmod Version:1.28 -Release:1 -License:GPL +Release:3 +License:GPL-2.0+ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} 1120 BuildRequires: %kernel_module_package_buildreq @@ -33,6 +33,7 @@ Url: http://ts.hercules.com/ger/index.php?pg=view_filesgid=17fid=62pid=177cid=1 Group: System/Kernel Source0:hdjmod-%{version}.tar.bz2 +Source1:preamble # PATCH-FIX-UPSTREAM hdjmod_kernel_2.6.30.patch ma...@marix.org -- Fix build on kernel 2.6.30 and newer Patch0: hdjmod_kernel_2.6.30.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_2.6.36.patch ma...@marix.org -- Fix includes for kfree Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org