summaryrefslogtreecommitdiff
path: root/linphone
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /linphone
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'linphone')
-rw-r--r--linphone/files/disable-gtk-doc.patch14
-rw-r--r--linphone/linphone-0.12.2/osip-lossage.patch36
-rw-r--r--linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch27
-rw-r--r--linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch16
-rw-r--r--linphone/linphone-hh_0.12.2.hh1.bb0
-rw-r--r--linphone/linphone_0.12.2.bb0
6 files changed, 0 insertions, 93 deletions
diff --git a/linphone/files/disable-gtk-doc.patch b/linphone/files/disable-gtk-doc.patch
deleted file mode 100644
index c616037244..0000000000
--- a/linphone/files/disable-gtk-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- linphone-0.12.2/configure.in 2004-03-31 21:22:55.000000000 +0100
-+++ linphone-0.12.2.hh1/configure.in 2004-08-31 19:44:48.000000000 +0100
-@@ -313,7 +358,10 @@
- fi
-
- AC_SUBST(HTML_DIR)
--PKG_CHECK_MODULES(GTK_DOC,gtk-doc >= 0.4, enable_gtk_doc=yes,enable_gtk_doc=no )
-+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc enable documentation build])
-+if test "x$enable_gtk_doc" != "xno" ; then
-+ PKG_CHECK_MODULES(GTK_DOC,gtk-doc >= 0.4, enable_gtk_doc=yes,enable_gtk_doc=no )
-+fi
- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes )
-
- LINPHONE_CFLAGS="$GLIB_CFLAGS -I${includedir} -I${includedir}/linphone -I${includedir}/osipua -I${includedir}/ortp "
diff --git a/linphone/linphone-0.12.2/osip-lossage.patch b/linphone/linphone-0.12.2/osip-lossage.patch
deleted file mode 100644
index d5d5cfcab8..0000000000
--- a/linphone/linphone-0.12.2/osip-lossage.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- linphone-0.12.2/console/Makefile.am.old 2004-07-03 10:15:37.000000000 +0100
-+++ linphone-0.12.2/console/Makefile.am 2004-07-03 10:15:42.000000000 +0100
-@@ -8,8 +8,7 @@
- -I$(top_srcdir)/oRTP/src \
- -I$(top_srcdir)/oRTP/ \
- -I$(top_srcdir)/mediastreamer \
-- $(SPEEX_CFLAGS) \
-- -I$(osip_prefix)/include/
-+ $(SPEEX_CFLAGS)
-
-
-
---- linphone-0.12.2/coreapi/Makefile.am.old 2004-07-03 10:15:47.000000000 +0100
-+++ linphone-0.12.2/coreapi/Makefile.am 2004-07-03 10:15:51.000000000 +0100
-@@ -10,8 +10,7 @@
- -I$(top_srcdir)/oRTP/src \
- -I$(top_srcdir)/oRTP/ \
- -I$(top_srcdir)/mediastreamer \
-- $(SPEEX_CFLAGS) \
-- -I$(osip_prefix)/include/
-+ $(SPEEX_CFLAGS)
-
- EXTRA_DIST= parse-path.cP
-
---- linphone-0.12.2/gnome/Makefile.am.old 2004-07-03 10:15:55.000000000 +0100
-+++ linphone-0.12.2/gnome/Makefile.am 2004-07-03 10:16:00.000000000 +0100
-@@ -23,8 +23,7 @@
- -I$(top_srcdir)/speex/libspeex \
- -I$(top_srcdir)/coreapi \
- -I$(top_srcdir)/osipua/ \
-- -I$(top_srcdir)/osipua/src \
-- -I$(osip_prefix)/include/
-+ -I$(top_srcdir)/osipua/src
-
-
-
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
deleted file mode 100644
index ed3bfc2cae..0000000000
--- a/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
deleted file mode 100644
index 928f9aad5e..0000000000
--- a/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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)
diff --git a/linphone/linphone-hh_0.12.2.hh1.bb b/linphone/linphone-hh_0.12.2.hh1.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linphone/linphone-hh_0.12.2.hh1.bb
+++ /dev/null
diff --git a/linphone/linphone_0.12.2.bb b/linphone/linphone_0.12.2.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linphone/linphone_0.12.2.bb
+++ /dev/null