hardware/hdjmod -> openSUSE:Factory:Contrib/hdjmod https://build.opensuse.org/request/diff/74477 Description: - Fixed build on kernels newer than openSUSE 11.4 - Fixed build on SLE 11 SP 1 changes files: -------------- --- hdjmod.changes +++ hdjmod.changes @@ -1,0 +2,10 @@ +Mon May 30 20:06:14 UTC 2011 - marix@marix.org + +- Fixed build on kernels newer than openSUSE 11.4 + +------------------------------------------------------------------- +Sat Apr 30 19:14:52 UTC 2011 - marix@marix.org + +- Fixed build on SLE 11 SP 1 + +------------------------------------------------------------------- new: ---- hdjmod_kernel_2.6.39.patch spec files: ----------- --- hdjmod.spec +++ hdjmod.spec @@ -36,6 +36,8 @@ Patch2: hdjmod_kernel_2.6.36.patch.bz2 # PATCH-FIX-UPSTREAM hdjmod_kernel_2.6.37.patch marix@marix.org -- Fix build on kernel 2.6.37 and newer Patch3: hdjmod_kernel_2.6.37.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_2.6.39.patch marix@marix.org -- Fix build on kernel 2.6.39 and newer +Patch4: hdjmod_kernel_2.6.39.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 @@ -49,12 +51,13 @@ %prep echo %flavors_to_build %setup -q -%if 0%{?suse_version} >= 1120 +%if 0%{?suse_version} >= 1120 || 0%{?sles_version} > 10 %patch0 -p1 %endif %if 0%{?suse_version} >= 1140 %patch2 -p1 %patch3 -F3 -p1 +%patch4 -p1 %endif %patch1 -p1 set -- * other changes: -------------- ++++++ hdjmod_kernel_2.6.30.patch --- hdjmod_kernel_2.6.30.patch +++ hdjmod_kernel_2.6.30.patch @@ -5,7 +5,7 @@ /* let the kernel option override custom id */ strncpy(card_id,id[idx],sizeof(card_id)-1); } -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ) ++#if ( 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); ++++++ hdjmod_kernel_2.6.39.patch (new) --- hdjmod_kernel_2.6.39.patch +++ hdjmod_kernel_2.6.39.patch +diff -Naru hdjmod-1.28o/midi.c hdjmod-1.28/midi.c +--- hdjmod-1.28o/midi.c 2009-01-27 15:25:50.000000000 +0100 ++++ hdjmod-1.28/midi.c 2011-05-30 21:47:18.000000000 +0200 +@@ -60,7 +60,7 @@ + + unsigned long channel_list_initialized = 0; + struct midi_channel_elem channel_list[NUM_MIDI_CHANNELS]; +-spinlock_t channel_list_lock = SPIN_LOCK_UNLOCKED; ++DEFINE_SPINLOCK(channel_list_lock); + + static struct usb_protocol_ops snd_hdjmidi_standard_ops = { + .input = snd_hdjmidi_standard_input, To REVIEW against the previous version: osc request show --diff 74477 To ACCEPT the request: osc request accept 74477 --message="reviewed ok." To DECLINE the request: osc request decline 74477 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 74477 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: opensuse-contrib+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-contrib+help@opensuse.org