diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /linphone/linphone-hh-0.12.2.hh1 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'linphone/linphone-hh-0.12.2.hh1')
| -rw-r--r-- | linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch | 27 | ||||
| -rw-r--r-- | linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch | 16 |
2 files changed, 43 insertions, 0 deletions
diff --git a/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch b/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch index e69de29bb2..ed3bfc2cae 100644 --- a/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch +++ b/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch @@ -0,0 +1,27 @@ +--- linphone-0.12.2.hh1/gpe/Makefile.am.old 2004-08-29 21:16:33.000000000 +0100 ++++ linphone-0.12.2.hh1/gpe/Makefile.am 2004-08-29 21:16:52.000000000 +0100 +@@ -28,23 +28,6 @@ + propertybox.c propertybox.h \ + linphone-gpe.c linphone-gpe.h + +-linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) \ ++linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) $(ALSA_LIBS) \ + $(top_srcdir)/coreapi/liblinphone.la + +-if CROSS_COMPILING +- +-CROSS_ALSA_CFLAGS = -I/usr/local/arm/familiar/usr/include +-CROSS_ALSA_LIBS = -L/usr/local/arm/familiar/usr/lib -lasound +- +-linphone_gpe_LDFLAGS = /usr/local/arm/familiar/usr/X11R6/lib/libX11.so \ +- /usr/local/arm/familiar/usr/X11R6/lib/libXi.so \ +- /usr/local/arm/familiar/usr/X11R6/lib/libXext.so \ +- /usr/local/arm/familiar/usr/X11R6/lib/libXrender.so \ +- /usr/local/arm/familiar/usr/X11R6/lib/libXft.so \ +- /usr/local/arm/familiar/usr/lib/libfontconfig.so \ +- /usr/local/arm/familiar/usr/lib/libfreetype.so \ +- /usr/local/arm/familiar/usr/lib/libexpat.so \ +- $(CROSS_ALSA_LIBS) +-else +-linphone_gpe_LDFLAGS = $(ALSA_LIBS) +-endif diff --git a/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch b/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch index e69de29bb2..928f9aad5e 100644 --- a/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch +++ b/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch @@ -0,0 +1,16 @@ +--- linphone-0.12.2.hh1/osipua/src/Makefile.am~osipua-ipv6-lossage.patch 2004-05-14 22:04:13.000000000 +0100 ++++ linphone-0.12.2.hh1/osipua/src/Makefile.am 2004-08-29 21:06:30.000000000 +0100 +@@ -41,11 +41,11 @@ + + noinst_PROGRAMS = osipua_tester test_sdphandler + osipua_tester_SOURCES = osipua_tester.c osipua_tester.h +-osipua_tester_CFLAGS = $(OSIP_CFLAGS) ++osipua_tester_CFLAGS = $(OSIP_CFLAGS) $(IPV6_CFLAGS) + osipua_tester_LDADD = libosipua.la + osipua_tester_LDFLAGS = $(OSIP_LDFLAGS) + + test_sdphandler_SOURCES = test_sdphandler.c +-test_sdphandler_CFLAGS = $(OSIP_CFLAGS) ++test_sdphandler_CFLAGS = $(OSIP_CFLAGS) $(IPV6_CFLAGS) + test_sdphandler_LDADD = libosipua.la + test_sdphandler_LDFLAGS = $(OSIP_LDFLAGS) |