Attachment 910431 Details for Bug 1106795 – Patch for rawhide

[patch] Patch for rawhide

0001-Use-system-libshout-link-with-libogg-992568-1106795.patch (text/plain), 4.82 KB, created by Yaakov Selkowitz on 2014-06-19 15:15:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-19 15:15:40 UTC

Size: 4.82 KB

patch

obsolete

>From ba494d51a2a803790e8876e7dfae9c12b47a6b30 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Thu, 19 Jun 2014 10:13:43 -0500
>Subject: [PATCH] Use system libshout, link with libogg (#992568, #1106795)
>
>---
> idjc-0.8.7-libogg.patch | 21 +++++++++++++++++++++
> idjc.spec               | 23 +++++++++++++----------
> 2 files changed, 34 insertions(+), 10 deletions(-)
> create mode 100644 idjc-0.8.7-libogg.patch
>
>diff --git a/idjc-0.8.7-libogg.patch b/idjc-0.8.7-libogg.patch
>new file mode 100644
>index 0000000..7233543
>--- /dev/null
>+++ b/idjc-0.8.7-libogg.patch
>@@ -0,0 +1,21 @@
>+--- a/c/Makefile.am
>++++ b/c/Makefile.am
>+@@ -6,6 +6,6 @@ idjcsourceclient_LDADD=-lpthread ${DYN_LIBS} ${LIBMP3LAME} ${LIBM} ${LIBJACK_LIB
>+ idjcsourceclient_LDFLAGS=${DYN_LDFLAGS}
>+ 
>+ idjcmixer_SOURCES=idjcmixer.c kvpdict.c kvpparse.c kvpdict.h kvpparse.h dbconvert.c dbconvert.h ialloc.c ialloc.h xlplayer.c xlplayer.h compressor.c compressor.h sndfileinfo.c sndfileinfo.h flacdecode.c flacdecode.h mp3dec.c mp3dec.h sndfiledecode.c sndfiledecode.h avcodecdecode.c avcodecdecode.h mp3tagread.c mp3tagread.h oggdec.c oggdec.h ogg_vorbis_dec.c ogg_vorbis_dec.h ogg_flac_dec.c ogg_flac_dec.h ogg_speex_dec.c ogg_speex_dec.h speextag.c speextag.h bsdcompat.c bsdcompat.h gnusource.h agc.c agc.h dyn_mad.c dyn_mad.h mad.h mic.c mic.h peakfilter.c peakfilter.h
>+-idjcmixer_CFLAGS=-Wall -std=gnu99 -O2 ${LIBVORBIS_CFLAGS} ${LIBJACK_CFLAGS} ${LIBSAMPLERATE_CFLAGS} ${LIBFLAC_CFLAGS} ${LIBSNDFILE_CFLAGS} ${LIBMAD_CFLAGS} ${LIBAVCODEC_CFLAGS} ${LIBAVFORMAT_CFLAGS} ${LIBAVUTIL_CFLAGS} ${LIBSPEEX_CFLAGS} ${GLIB_CFLAGS}
>+-idjcmixer_LDADD=-lpthread ${DYN_LIBS} ${LIBM} ${LIBVORBIS_LIBS} ${LIBJACK_LIBS} ${LIBSAMPLERATE_LIBS} ${LIBFLAC_LIBS} ${LIBSNDFILE_LIBS} ${LIBMAD_LIBS} ${LIBAVCODEC_LIBS} ${LIBAVFORMAT_LIBS} ${LIBAVUTIL_LIBS} ${LIBSPEEX_LIBS} ${GLIB_LIBS}
>++idjcmixer_CFLAGS=-Wall -std=gnu99 -O2 ${LIBVORBIS_CFLAGS} ${LIBJACK_CFLAGS} ${LIBSAMPLERATE_CFLAGS} ${LIBFLAC_CFLAGS} ${LIBSNDFILE_CFLAGS} ${LIBMAD_CFLAGS} ${LIBAVCODEC_CFLAGS} ${LIBAVFORMAT_CFLAGS} ${LIBAVUTIL_CFLAGS} ${LIBSPEEX_CFLAGS} ${LIBOGG_CFLAGS} ${GLIB_CFLAGS}
>++idjcmixer_LDADD=-lpthread ${DYN_LIBS} ${LIBM} ${LIBVORBIS_LIBS} ${LIBJACK_LIBS} ${LIBSAMPLERATE_LIBS} ${LIBFLAC_LIBS} ${LIBSNDFILE_LIBS} ${LIBMAD_LIBS} ${LIBAVCODEC_LIBS} ${LIBAVFORMAT_LIBS} ${LIBAVUTIL_LIBS} ${LIBSPEEX_LIBS} ${LIBOGG_LIBS} ${GLIB_LIBS}
>+ idjcmixer_LDFLAGS=${DYN_LDFLAGS}
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -24,6 +24,7 @@ PKG_CHECK_MODULES(LIBJACK, [jack >= 0.98.0])
>+ AC_CHECK_LIB([jack],[jack_set_info_function],[AC_DEFINE(HAVE_JACK_SET_INFO_FUNCTION, 1, [set for presence of])], [])
>+ 
>+ # Also check for libvorbis and libvorbisenc
>++PKG_CHECK_MODULES([LIBOGG], [ogg >= 1.0.0])
>+ PKG_CHECK_MODULES([LIBVORBIS], [vorbis >= 1.0.0])
>+ PKG_CHECK_MODULES([LIBVORBISENC], [vorbisenc >= 1.0.0])
>+ 
>diff --git a/idjc.spec b/idjc.spec
>index 8492504..80efcac 100644
>--- a/idjc.spec
>+++ b/idjc.spec
>@@ -1,6 +1,6 @@
> Name:           idjc
> Version:        0.8.7
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        DJ application for streaming audio
> 
> Group:          Applications/Multimedia
>@@ -11,8 +11,9 @@ Source1:        %{name}-README.Fedora
> #fix value error bug
> #http://sourceforge.net/tracker/?func=detail&atid=733855&aid=3531294&group_id=135773
> Patch0:         idjc-0.8.7-valueerror.patch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Patch1:         idjc-0.8.7-libogg.patch
> 
>+BuildRequires:  autoconf automake gettext-devel libtool
> BuildRequires:  pygtk2-devel
> BuildRequires:  python-mutagen
> BuildRequires:  jack-audio-connection-kit-devel
>@@ -38,17 +39,19 @@ major free audio codecs.
> %prep
> %setup -q
> %patch0 -p1 -b .orig
>+%patch1 -p1 -b .libogg
>+autoreconf -fiv
> cp %{SOURCE1} README.Fedora
> 
> 
> %build
>-%configure
>+# static: use system libshout
>+%configure --disable-static
> make %{?_smp_mflags}
> 
> 
> %install
>-rm -rf %{buildroot}
>-make install DESTDIR=%{buildroot}
>+make install DESTDIR=%{buildroot} docdir=%{_pkgdocdir}
> %find_lang %{name}
> desktop-file-install --delete-original \
>     --remove-category=Application \
>@@ -57,12 +60,7 @@ desktop-file-install --delete-original \
>     %{buildroot}%{_datadir}/applications/%{name}.desktop
> 
> 
>-%clean
>-rm -rf %{buildroot}
>-
>-
> %files -f %{name}.lang
>-%defattr(-,root,root,-)
> %{_bindir}/%{name}*
> %{python_sitelib}/%{name}*
> %attr(755,root,root) %{python_sitelib}/%{name}/mutagentagger.py
>@@ -75,6 +73,11 @@ rm -rf %{buildroot}
> 
> 
> %changelog
>+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.7-7
>+- Fix usage of system libshout
>+- Fix FTBFS due to undefined reference to libogg (#992568, #1106795)
>+- Fix for https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.7-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106795: 905320 | 905321 | 905322 | 910431