Rawhide: Patch for CELT 0.11 API change because of current broken deps.

epel8
Michael Schwendt 14 years ago
parent 9bfdbacd9c
commit 884fcfd29f

@ -0,0 +1,21 @@
diff -Nur jack-1.9.6-orig/common/JackNetOneDriver.cpp jack-1.9.6/common/JackNetOneDriver.cpp
--- jack-1.9.6-orig/common/JackNetOneDriver.cpp 2010-08-30 12:23:53.000000000 +0200
+++ jack-1.9.6/common/JackNetOneDriver.cpp 2011-02-19 23:55:14.000000000 +0100
@@ -161,7 +161,7 @@
#if HAVE_CELT_API_0_7
celt_int32 lookahead;
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
- netj.capture_srcs = jack_slist_append(netj.capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
+ netj.capture_srcs = jack_slist_append(netj.capture_srcs, celt_decoder_create_custom( celt_mode, 1, NULL ) );
#else
celt_int32_t lookahead;
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL );
@@ -209,7 +209,7 @@
#if HAVE_CELT
#if HAVE_CELT_API_0_7
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
- netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) );
#else
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL );
netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create( celt_mode ) );

@ -4,7 +4,7 @@
Summary: The Jack Audio Connection Kit Summary: The Jack Audio Connection Kit
Name: jack-audio-connection-kit Name: jack-audio-connection-kit
Version: 1.9.6 Version: 1.9.6
Release: 5%{?dist} Release: 6%{?dist}
# The entire source (~500 files) is a mixture of these three licenses # The entire source (~500 files) is a mixture of these three licenses
License: GPLv2 and GPLv2+ and LGPLv2+ License: GPLv2 and GPLv2+ and LGPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
@ -21,6 +21,8 @@ Patch1: jack-infrastructure.patch
Patch4: jack-realtime-compat.patch Patch4: jack-realtime-compat.patch
# Compile against celt-0.8.0 # Compile against celt-0.8.0
Patch5: jack-celt08.patch Patch5: jack-celt08.patch
# compile with CELT 0.11 API
Patch6: jack-1.9.6-celt011.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -80,6 +82,9 @@ Small example clients that use the Jack Audio Connection Kit.
%if 0%{?fedora} > 13 %if 0%{?fedora} > 13
%patch5 -p1 -b .celt08 %patch5 -p1 -b .celt08
%endif %endif
%if 0%{?fedora} > 14
%patch6 -p1 -b .celt11
%endif
# Fix encoding issues # Fix encoding issues
for file in ChangeLog README TODO; do for file in ChangeLog README TODO; do
@ -221,6 +226,9 @@ exit 0
%changelog %changelog
* Sat Feb 19 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 1.9.6-6
- Rawhide: Patch for CELT 0.11 API change because of current broken deps.
* Wed Feb 16 2011 Peter Robinson <pbrobinson@gmail.com> - 1.9.6-5 * Wed Feb 16 2011 Peter Robinson <pbrobinson@gmail.com> - 1.9.6-5
- Try again once repo has refreshed - Try again once repo has refreshed

Loading…
Cancel
Save