Packman Build Service PMBS

File butt-fix.patch of Package butt (Revision 5)

Currently displaying revision 5 , Show latest

--- 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