Packman Build Service PMBS

Changes of Revision 2

butt.changes Changed

butt-fix.patch Changed

@@ -1,5 +1,5 @@
---- configure.orig	2011-12-27 01:58:47.360000514 +0100
-+++ configure	2011-12-27 02:08:14.906000514 +0100
+--- 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=
@@ -18,8 +18,26 @@
                  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
---- src/Makefile.orig	2011-12-27 01:57:17.480000516 +0100
-+++ src/Makefile	2011-12-27 02:07:45.237000515 +0100
+@@ -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 --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 --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 @@
  ##########################
  
@@ -44,8 +62,8 @@
  	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
  
  butt.o : ../config.mk
---- Makefile.orig	2011-12-27 02:09:56.008000515 +0100
-+++ Makefile	2011-12-27 02:10:08.858000515 +0100
+--- 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