Request 3228 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 3228 (accepted)

Update to 0.1.15

Created by Aloysius over 7 years ago
In state accepted

Submit butt

Submit package home:Aloysius:branches:Multimedia / butt to package Multimedia / butt

butt.changes Changed

butt.spec Changed

@@ -1,23 +1,54 @@
-# vim: set sw=4 ts=4 et nu:
-
-Name:               butt
-Version:            0.1.12
-Release:            0.pm.1
-Summary:            Broadcast Using This Tool
-Source:             http://prdownloads.sourceforge.net/butt/butt-%{version}-src.tar.bz2
-Patch1:             butt-fix.patch
-URL:                http://metaversemusician.com/blog/
-Group:              Productivity/Multimedia/Sound/Mixers
-License:            GPL-2.0+
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      fltk-devel xorg-x11-devel
-BuildRequires:      libmp3lame-devel
-BuildRequires:      libogg-devel libvorbis-devel
-BuildRequires:      portaudio-devel
-BuildRequires:      gcc-c++ make glibc-devel pkgconfig
-BuildRequires:      update-desktop-files
+#
+# spec file for package butt
+#
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 Pascal Bleser <pascal.bleser@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+
+Name:           butt
+Version:        0.1.15
+Release:        0
+Summary:        Broadcast Using This Tool
+License:        GPL-2.0+
+Group:          Productivity/Multimedia/Sound/Mixers
+Url:            http://danielnoethen.de
+Source:         https://sf.net/projects/%{name}/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch1:         butt-fix.patch
+Patch2:         butt-gcc6.patch
+BuildRequires:  automake
+BuildRequires:  fdk-aac-devel
+BuildRequires:  flac-devel
+BuildRequires:  fltk-devel
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
 # These ones are not really needed. Here only because fltk-config is stupid.
-BuildRequires:      libjpeg-devel libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+#
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libopus-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  make
+BuildRequires:  pkgconfig
+BuildRequires:  portaudio-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 butt (broadcast using this tool) is an easy to use, multi OS streaming tool.
@@ -25,26 +56,22 @@
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
+%patch2 -p1
 
 %build
-DEBUG="%{optflags}" \
-./configure \
-    --prefix "%{_prefix}" \
-    --with-mp3 \
-    --with-ogg
-    
-%__make %{?_smp_flags} DEBUG="%{optflags}"
+export ac_cv_func_malloc_0_nonnull=yes
+export ac_cv_func_realloc_0_nonnull=yes
+autoreconf -fi
+%configure
+make %{?_smp_mflags}
 
 %install
-%__make prefix="%{_prefix}" DESTDIR="%{buildroot}" install
-
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+make prefix="%{_prefix}" DESTDIR=%{buildroot} install
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog KNOWN_BUGS LICENSE README
+%doc ChangeLog COPYING KNOWN_BUGS README
 %{_bindir}/butt
 
 %changelog

butt-fix.patch Changed

@@ -1,75 +1,13 @@
---- configure.orig	2010-06-05 10:34:34.000000000 +0200
-+++ configure	2011-12-27 02:32:16.949000515 +0100
-@@ -4,7 +4,7 @@
- [ -z $CXXFLAGS ] && CXXFLAGS=
- [ -z $LDFLAGS ] && LDFLAGS=
- 
--LIBS=""
-+LIBS="-lpthread -lX11"
- STATIC=0
- CHECK_FLTK=1
- CHECK_QT=0
-@@ -132,7 +132,7 @@
-                 echo "#_______________________" >&4
-                 echo "WITH_FLTK:=1" >&4
-                 echo "CXXFLAGS_FLTK:=`fltk-config --cxxflags` -DFLTK1" >&4
--                echo "LIBS_FLTK:=`fltk-config --use-images --ldstaticflags`" >&4
-+                echo "LIBS_FLTK:=`fltk-config --use-images --ldflags`" >&4
-                 echo "SRC_FLTK:=FLTK/fl_callbacks.cpp FLTK/fl_funcs.cpp FLTK/flgui.cpp FLTK/Fl_ILM216.cpp FLTK/Fl_Native_File_Chooser.cpp" >&4
-                 echo "" >&4
-                 GUI=FLTK
-@@ -227,7 +227,7 @@
-     then
-         echo "OK"
-         msg_chkfor "link with libvorbis"
--        if ${CXX} tmp.c -o /dev/null -lvorbisenc 2>&3
-+        if ${CXX} tmp.c -o /dev/null `pkg-config vorbis vorbisenc ogg --libs` 2>&3
-         then
-             echo "OK"
-             echo "#_______________________" >&4
-@@ -235,7 +235,7 @@
-                 echo "CXXFLAGS_LIBVORBIS:=" >&4
-                 echo "CXXFLAGS+=$vorbis_header" >&4
-                 echo "LDFLAGS+=$vorbis_lib" >&4
--                [ "$STATIC" -eq 0 ] && echo "LIBS_LIBVORBIS:=-lvorbisenc" >&4
-+                echo "LIBS_LIBVORBIS:=`pkg-config vorbis vorbisenc ogg --libs`" >&4
-                 echo "SRC_LIBVORBIS:=vorbis_encode.cpp" >&4
-                 echo "" >&4
-                 OGG=1
---- src/Makefile.orig	2010-06-05 10:34:34.000000000 +0200
-+++ src/Makefile	2011-12-27 02:19:45.749000514 +0100
-@@ -17,11 +17,10 @@
- ##########################
- 
- DEBUG= 
--MAKEDEP ?= g++ -MM -I. -I/usr/local/include -IFLTK
-+MAKEDEP ?= g++ -MM -I. -IFLTK
- CXX ?= g++
--CXXFLAGS += $(DEBUG) -I. -I/usr/local/include -Wall -O2 -DVERSION=$(VERSION) ``
--LDFLAGS += -L/usr/local/lib `` #-lduma #-ldiehard_r 
--LIBS ?= 
-+CXXFLAGS += $(DEBUG) -I. -Wall -DVERSION=$(VERSION) ``
-+LDFLAGS += 
- 
- ##########################
- 
-@@ -53,6 +52,8 @@
- #######################
- 
- $(TARGET) : $(OBJECTS)
-+	@echo LIBS: $(LIBS)
-+	@echo LDFLAGS: $(LDFLAGS)
- 	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
- 
- butt.o : ../config.mk
---- Makefile.orig	2010-06-05 10:34:34.000000000 +0200
-+++ Makefile	2011-12-27 02:19:45.757000514 +0100
-@@ -39,7 +39,7 @@
- 	rm -f config.mk config.log tmp.c
- 
- install: butt
--	cp -fv src/butt $(DESTDIR)$(prefix)/bin/butt
-+	install -D -m0755 src/butt $(DESTDIR)$(prefix)/bin/butt
- 
- uninstall:
- 	rm -fv $(DESTDIR)$(prefix)/bin/butt
+Index: butt-0.1.15/configure.ac
+===================================================================
+--- butt-0.1.15.orig/configure.ac
++++ butt-0.1.15/configure.ac
+@@ -61,7 +61,7 @@ AC_CHECK_PROG([FLTKCONFIG],[fltk-config]
+ if test "$FLTKCONFIG" = "fltk-config"; then
+     AC_CHECK_LIB([fltk], [main], 
+ 		    [
+-		    LIBS="$LIBS `fltk-config --ldflags --use-images`"
++		    LIBS="$LIBS `fltk-config --ldflags --use-images` -lX11"
+ 		    CXXFLAGS="$CXXFLAGS `fltk-config --cxxflags`"
+ 		    ],
+ 		    [AC_MSG_ERROR([**** Could not find libfltk     ****])]

butt-gcc6.patch Added

@@ -0,0 +1,35 @@
+Index: butt-0.1.15/src/port_audio.cpp
+===================================================================
+--- butt-0.1.15.orig/src/port_audio.cpp
++++ butt-0.1.15/src/port_audio.cpp
+@@ -551,7 +551,7 @@ int snd_callback(const void *input,
+             srconv_stream.input_frames = frameCount;
+             srconv_stream.output_frames = frameCount*cfg.audio.channel * (srconv_stream.src_ratio+1) * sizeof(float);
+ 
+-            src_short_to_float_array((short*)pa_pcm_buf, srconv_stream.data_in, frameCount*cfg.audio.channel);
++            src_short_to_float_array((short*)pa_pcm_buf, (float*)srconv_stream.data_in, frameCount*cfg.audio.channel);
+ 
+             //The actual resample process
+             src_process(srconv_state_stream, &srconv_stream);
+@@ -582,7 +582,7 @@ int snd_callback(const void *input,
+             srconv_record.input_frames = frameCount;
+             srconv_record.output_frames = frameCount*cfg.audio.channel * (srconv_record.src_ratio+1) * sizeof(float);
+ 
+-            src_short_to_float_array((short*)pa_pcm_buf, srconv_record.data_in, frameCount*cfg.audio.channel);
++            src_short_to_float_array((short*)pa_pcm_buf, (float*)srconv_record.data_in, frameCount*cfg.audio.channel);
+ 
+             //The actual resample process
+             src_process(srconv_state_record, &srconv_record);
+@@ -773,10 +773,10 @@ void snd_close(void)
+     Pa_CloseStream(stream);
+     Pa_Terminate();
+ 
+-    free(srconv_stream.data_in);
++    free((void*)srconv_stream.data_in);
+     free(srconv_stream.data_out);
+ 
+-    free(srconv_record.data_in);
++    free((void*)srconv_record.data_in);
+     free(srconv_record.data_out);
+ 
+     free(pa_pcm_buf);

butt-0.1.12-src.tar.bz2 -> butt-0.1.15.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 3228 0

Request History

Aloysius created request over 7 years ago

Update to 0.1.15

olh accepted request over 7 years ago