#! /bin/sh /usr/share/dpatch/dpatch-run ## 01-Makefile.Configure.dpatch by Elias Mussi ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad gingacc-player~/Makefile.am gingacc-player/Makefile.am --- gingacc-player~/Makefile.am 2008-04-25 15:49:30.000000000 -0300 +++ gingacc-player/Makefile.am 2008-05-20 22:05:51.000000000 -0300 @@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = files include src -INCLUDES = -I/usr/local/include/ -I/usr/local/include/ginga/ +INCLUDES = -I/usr/include/ -I/usr/include/ginga/ diff -urNad gingacc-player~/configure.in gingacc-player/configure.in --- gingacc-player~/configure.in 2008-05-14 11:32:31.000000000 -0300 +++ gingacc-player/configure.in 2008-05-20 22:05:51.000000000 -0300 @@ -53,13 +53,13 @@ # Bring additional directories where things might be found into our # search path. I don't know why autoconf doesn't do this by default -for spfx in /usr/lib/ /usr/local/lib/ /usr/local/lib/ginga/; do +for spfx in /usr/lib/ /usr/local/lib/ /usr/local/lib/ginga/ /usr/lib/ginga/ /usr/lib/lua/5.1/; do if test -d ${spfx}; then LDFLAGS="-L${spfx} $LDFLAGS" fi done -for spfx in /usr/include/ /usr/local/include/ /usr/local/include/ginga/; do +for spfx in /usr/include/ /usr/local/include/ /usr/local/include/ginga/ /usr/include/ginga /usr/include/lua5.1/; do if test -d ${spfx}; then CPPFLAGS="-I${spfx} $CPPFLAGS" fi @@ -139,12 +139,12 @@ ####### # Lua # ####### -AC_HAVE_LIBRARY(lua, , AC_ERROR([ +AC_HAVE_LIBRARY(lua5.1, , AC_ERROR([ Couldn't find Lua library. Please install Lua 5.1.2 or later. -]), -llua, -ldl) +]), -llua5.1, -ldl) AC_OUTPUT(Makefile files/Makefile files/scripts/Makefile \ include/Makefile src/Makefile) diff -urNad gingacc-player~/files/scripts/Makefile.am gingacc-player/files/scripts/Makefile.am --- gingacc-player~/files/scripts/Makefile.am 2008-04-25 15:49:30.000000000 -0300 +++ gingacc-player/files/scripts/Makefile.am 2008-05-20 22:05:51.000000000 -0300 @@ -1,8 +1,8 @@ METASOURCES = AUTO -luadir = /usr/local/lib/lua/5.1/ +luadir = /usr/lib/lua/5.1/ lua_DATA = oo.lua ui.lua -luaguidir = /usr/local/lib/lua/5.1/gui +luaguidir = /usr/lib/lua/5.1/gui luagui_DATA = gui/Anim.lua gui/event.lua gui/ImageDraw.lua gui/MUVAnim.lua \ gui/TextDraw.lua gui/Draw.lua gui/gui.lua gui/InputDraw.lua gui/RectDraw.lua \ gui/Timer.lua gui/BoxDraw.lua gui/BoxTimer.lua gui/TextInputDraw.lua diff -urNad gingacc-player~/include/Makefile.am gingacc-player/include/Makefile.am --- gingacc-player~/include/Makefile.am 2008-05-14 11:32:30.000000000 -0300 +++ gingacc-player/include/Makefile.am 2008-05-20 22:05:51.000000000 -0300 @@ -1,5 +1,5 @@ METASOURCES = AUTO -localIncludedir = /usr/local/include/ginga/player +localIncludedir = /usr/include/ginga/player localInclude_HEADERS = AVPlayer.h ButtonPlayer.h ChannelPlayer.h \ ESPlayer.h GeodeVideo4Linux.h \ ImagePlayer.h LuaPlayer.h PlayerListener.h ProgramAV.h SrtPlayer.h \ diff -urNad gingacc-player~/src/Makefile.am gingacc-player/src/Makefile.am --- gingacc-player~/src/Makefile.am 2008-05-14 11:32:30.000000000 -0300 +++ gingacc-player/src/Makefile.am 2008-05-20 22:05:51.000000000 -0300 @@ -1,10 +1,10 @@ # set the include path found by configure -INCLUDES = -I/usr/local/include/directfb/ -I/usr/local/include/ginga/ \ +INCLUDES = -I/usr/include/directfb/ -I/usr/include/ginga/ \ $(all_includes) # the library search path. -localLibdir = /usr/local/lib/ginga +localLibdir = /usr/lib/ginga localLib_PROGRAMS = libgingaccplayer.so libgingaccplayer_so_SOURCES = AVPlayer.cpp ButtonPlayer.cpp ChannelPlayer.cpp \ @@ -14,7 +14,7 @@ LinksPlayer.cpp Player.cpp libgingaccplayer_so_LDADD = -ltelemidiautil -lpthread -ldirectfb -lgingaccio \ - -llua -ltelemidialinks + -llua5.1 -ltelemidialinks -libgingaccplayer_so_LDFLAGS = -L/usr/local/lib/ginga -L/usr/local/lib \ +libgingaccplayer_so_LDFLAGS = -L/usr/lib/ginga -L/usr/lib \ -g -shared -Wl,-soname,libgingaccplayer.so