sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build in presence of mpeg4ip by hardcoding /usr/lib/spd.so (mpeg4ip

Browse source 
installs another spd.so to localbase)

PR:		ports/131778
Submitted by:	Guido Falsi <mad@madpilot.net> (maintainer)
Reported by:	Vladimir Kushnir <vkushnir@bigmir.net>
This commit is contained in:
Pav Lucistnik 2009-03-22 20:50:13 +00:00
parent 274b7984dc
commit 8e41d668be
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=230699
6 changed files with 51 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
comms/gnokii/files/patch-common-devices-unixbluetooth.c
View file

@ -1,11 +1,11 @@
--- common/devices/unixbluetooth.c.orig 2008-10-05 12:14:31.000000000 +0200
+++ common/devices/unixbluetooth.c 2008-11-04 22:30:35.000000000 +0100
+++ common/devices/unixbluetooth.c 2009-02-17 17:03:58.000000000 +0100
@@ -54,6 +54,8 @@
#include <netgraph/bluetooth/include/ng_hci.h>
#include <netgraph/bluetooth/include/ng_l2cap.h>
#include <netgraph/bluetooth/include/ng_btsocket.h>
+#include <bluetooth.h>
+#include <sdp.h>
+#include </usr/include/sdp.h>
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
#define BDADDR_ANY NG_HCI_BDADDR_ANY

4
comms/gnokii/files/patch-configure
View file

@ -1,5 +1,5 @@
--- configure.orig 2008-10-06 08:57:27.000000000 +0200
+++ configure 2008-11-01 00:28:22.000000000 +0100
+++ configure 2009-02-26 17:21:58.000000000 +0100
@@ -1057,7 +1057,7 @@
psdir='${docdir}'
libdir='${exec_prefix}/lib'
@ -110,7 +110,7 @@
echo "${ECHO_T}$ac_cv_lib_bluetooth_bt_aton" >&6; }
if test $ac_cv_lib_bluetooth_bt_aton = yes; then
- BLUETOOTH_LIBS="$LIBS -lbluetooth"
+ BLUETOOTH_LIBS="$LIBS -lsdp -lbluetooth"
+ BLUETOOTH_LIBS="-lsdp -lbluetooth $LIBS"
cat >>confdefs.h <<\_ACEOF
#define HAVE_BT_ATON
_ACEOF

11
comms/gnokii/files/patch-gnokii-Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- gnokii/Makefile.in.orig 2009-02-26 17:09:49.000000000 +0100
+++ gnokii/Makefile.in 2009-02-26 17:20:21.000000000 +0100
@@ -57,7 +57,7 @@
gnokii-gnokii-security.$(OBJEXT) \
gnokii-gnokii-settings.$(OBJEXT) gnokii-gnokii-sms.$(OBJEXT) \
gnokii-gnokii-todo.$(OBJEXT) gnokii-gnokii-utils.$(OBJEXT) \
- gnokii-gnokii-wap.$(OBJEXT)
+ gnokii-gnokii-wap.$(OBJEXT) /usr/lib/libsdp.so
gnokii_OBJECTS = $(am_gnokii_OBJECTS)
am__DEPENDENCIES_1 =
gnokii_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \

15
comms/gnokii/files/patch-gnokiid-Makefile.in
View file

@ -1,6 +1,15 @@
--- gnokiid/Makefile.in.orig 2008-05-03 21:21:29.000000000 +0200
+++ gnokiid/Makefile.in 2008-05-29 22:14:16.000000000 +0200
@@ -322,8 +322,8 @@
--- gnokiid/Makefile.in.orig 2008-10-06 08:57:16.000000000 +0200
+++ gnokiid/Makefile.in 2009-02-26 17:26:31.000000000 +0100
@@ -48,7 +48,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_gnokiid_OBJECTS = gnokiid-gnokiid.$(OBJEXT)
-gnokiid_OBJECTS = $(am_gnokiid_OBJECTS)
+gnokiid_OBJECTS = $(am_gnokiid_OBJECTS) /usr/lib/libsdp.so
am__DEPENDENCIES_1 =
gnokiid_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
$(top_builddir)/common/data/libDATA.la $(am__DEPENDENCIES_1)
@@ -326,8 +326,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

15
comms/gnokii/files/patch-smsd-Makefile.in
View file

@ -1,6 +1,15 @@
--- smsd/Makefile.in.orig 2008-05-03 21:21:32.000000000 +0200
+++ smsd/Makefile.in 2008-05-29 22:16:37.000000000 +0200
@@ -416,8 +416,8 @@
--- smsd/Makefile.in.orig 2008-10-06 08:57:19.000000000 +0200
+++ smsd/Makefile.in 2009-02-26 17:35:49.000000000 +0100
@@ -86,7 +86,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_smsd_OBJECTS = smsd.$(OBJEXT) lowlevel.$(OBJEXT)
-smsd_OBJECTS = $(am_smsd_OBJECTS)
+smsd_OBJECTS = $(am_smsd_OBJECTS) /usr/lib/libsdp.so
smsd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
@@ -421,8 +421,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

15
comms/gnokii/files/patch-xgnokii-Makefile.in
View file

@ -1,6 +1,15 @@
--- xgnokii/Makefile.in.orig 2008-02-23 17:19:30.000000000 +0100
+++ xgnokii/Makefile.in 2008-02-23 17:19:58.000000000 +0100
@@ -351,7 +351,8 @@
--- xgnokii/Makefile.in.orig 2008-10-06 08:57:20.000000000 +0200
+++ xgnokii/Makefile.in 2009-02-26 17:33:22.000000000 +0100
@@ -62,7 +62,7 @@
xgnokii-xgnokii_xring.$(OBJEXT) \
xgnokii-xgnokii_lowlevel.$(OBJEXT) \
xgnokii-xgnokii_data.$(OBJEXT)
-xgnokii_OBJECTS = $(am_xgnokii_OBJECTS)
+xgnokii_OBJECTS = $(am_xgnokii_OBJECTS) /usr/lib/libsdp.so
am__DEPENDENCIES_1 =
xgnokii_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la \
@@ -360,7 +360,8 @@
#FIXME install help
HELP_DIR = docs/help
pkgconfig_DATA = xgnokii.pc