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.changes 2012-12-28 15:01:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2014-09-17 10:11:07.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 20:47:24 UTC 2014 - marix@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.000000000 +0200 +++ /var/tmp/diff_new_pack.xOtFFQ/_new 2014-09-17 10:11:08.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package hdjmod # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright 2008 Matthias Bach <marix@marix.org> +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008-2014 Matthias Bach <marix@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 marix@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 marix@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 <marix@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.c 2014-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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org