On Sat, 2010-04-24 at 08:58 +0200, Eugen Dedu wrote: > C.J. Adams-Collier wrote: > > On Fri, 2010-04-23 at 18:08 +0200, Eugen Dedu wrote: > >> The safest solution is that I find out what -l flags exactly are needed > >> for ekiga. They should be used anyway, sooner or later. Could you > >> please make a patch? > > > > Sure. Where should I put those -l arguments? debian/rules? > > No. In ekiga code source. The best is to execute make until the link > error. Afterwards, re-execute the same link command, adding the correct > -l command, and see if it is better. You can also see what library has > the symbols not found (man symbol, or look to Internet). That's a fun idea, but when I run make, it doesn't show the command used to do the linking, it just shows: CXXLD libekiga.la .libs/gmwindow.o: In function `gdk_wmspec_change_state': /usr/src/git/gnome/ekiga/lib/../lib/gui/gmwindow.c:698: undefined reference to `XSendEvent' I'll check configure.ac to see if I can get it to be a bit more verbose... ooh! $ grep long configure.ac dnl use "make V=1" if you want to see the long awful lines looks like we're missing -lX11 -lXext. These should get added if the --enable-shm argument is passed to the configure script. I've modified debian/rules to add that argument to the confflags list. The configure.ac code doesn't actually add -lXext (or -lX11) to the libs list, though, so I've patched configure.ac accordingly. It's probably not the right way to do it, but it gets a bit farther. Not quite done yet... going to do some more now. Cheers, C.J. > >>> Also, I see that you are listed in the uploaders of the > >>> debian/control.in file. I'm making slight modifications to the debian/ > >>> directory as I try to get the gnome git version package to build. Is > >>> there a list I should send patches to for review? I've attached the > >>> diff in its current (unworking) state. > >> Thanks for the help. > > > > My pleasure ;) > > > >> If you wish master/trunk, you could use the diff.gz from > >> http://snapshots.ekiga.net/snapshots/debian/, which use exactly > >> master/trunk for ptlib, opal and ekiga, and uses -snapshot package > >> names. Or you could use the snapshots, even if a bit old. Please tell > >> us if you wish to help and what. > > > > Sounds good. I tried to build those, but I think they're slightly out > > of sync. Pre-built .debs will be easier to manage ;) > > > >> But master/trunk is not stable at the moment, so it is not a good idea > >> to push it into debian (even experimental). > > > > Understood. > > > >> Finally, could you explain the changes in rules (I do not see any > >> usefulness)? > > > > I wanted to be able to configure the source tree so that I could > > manually run make and get more verbose logs. They're not terribly > > useful if nobody will need to perform just the configure stage. >
diff --git a/configure.ac b/configure.ac
index 7b13b8c..ad70135 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,6 +444,8 @@ fi],enable_shm=yes)
if test "x${with_shm}" != "xno"; then
SHM="enabled"
AC_DEFINE(HAVE_SHM,1,[SHM Support])
+ SHM_LIBS="-lXext -lX11"
+ AC_SUBST(SHM_LIBS)
fi
fi
fi
@@ -949,7 +951,8 @@ echo " GStreamer support : $GSTREAMER"
echo " KAddressBook support : $KAB"
echo " KDE support : $KDE"
echo " XCAP support : $XCAP"
-echo " Loudmouth support : $LOUDMOUTH"
+echo " Loudmouth support : $LOUDMOUTH"
+echo " Shared Memory support : $SHM"
echo ""
echo " OS Type : $target_os"
echo " Machine Type : $target_cpu"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 254ae8f..4f7b2ec 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -667,6 +667,15 @@ libekiga_la_LDFLAGS += $(AVAHI_LIBS)
endif
##
+# Support for shared memory
+##
+if HAVE_SHM
+
+libekiga_la_LDFLAGS += $(SHM_LIBS)
+
+endif
+
+##
# Sources of the avahi publisher component
##
if HAVE_AVAHI
Index: debian/control
===================================================================
--- debian/control (revision 23990)
+++ debian/control (working copy)
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: ekiga
Section: gnome
Priority: optional
@@ -7,8 +12,8 @@
libsasl2-dev,
gettext,
libldap2-dev,
- libpt-dev (>= 2.6.5),
- libopal-dev (>= 3.6.6~),
+ libpt-dev (>= 2.8.0-1),
+ libopal-dev (>= 3.8.0~dfsg-1),
libgconf2-dev,
libxv-dev,
autotools-dev,
Index: debian/control.in
===================================================================
--- debian/control.in (revision 23990)
+++ debian/control.in (working copy)
@@ -7,8 +7,8 @@
libsasl2-dev,
gettext,
libldap2-dev,
- libpt-dev (>= 2.6.5),
- libopal-dev (>= 3.6.6~),
+ libpt-dev (>= 2.8.0-1),
+ libopal-dev (>= 3.8.0~dfsg-1),
libgconf2-dev,
libxv-dev,
autotools-dev,
Index: debian/changelog
===================================================================
--- debian/changelog (revision 23990)
+++ debian/changelog (working copy)
@@ -1,3 +1,9 @@
+ekiga (3.2.7-1) lucid; urgency=low
+
+ * moo
+
+ -- C.J. Adams-Collier <cjac colliertech org> Wed, 21 Apr 2010 00:37:18 -0700
+
ekiga (3.2.6-2) UNRELEASED; urgency=low
* NOT RELEASED YET
Index: debian/rules
===================================================================
--- debian/rules (revision 23990)
+++ debian/rules (working copy)
@@ -29,7 +29,8 @@
--prefix=/usr \
--sysconfdir=/etc \
--disable-schemas-install \
- --disable-scrollkeeper
+ --disable-scrollkeeper \
+ --enable-shm
patch: patch-stamp
patch-stamp:
@@ -46,12 +47,15 @@
[ ! -r gnome-doc-utils.make ] || cp -f /usr/share/gnome-doc-utils/gnome-doc-utils.make .
touch $@
-build: build-stamp
-build-stamp: patch-stamp
+conf-stamp: patch-stamp configure
dh_testdir
rm -f config.cache
CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure $(confflags)
+ touch $@
+
+build: build-stamp
+build-stamp: conf-stamp
$(MAKE) $(MAKEFLAGS)
touch $@
@@ -66,7 +70,7 @@
# unapply patches, if any
#$(QUILT) pop -a -R || test $$? = 2
-$(RM) -rf .pc
- -$(RM) -f build-stamp patch-stamp
+ -$(RM) -f build-stamp conf-stamp patch-stamp
dh_clean
install: build
Attachment:
signature.asc
Description: This is a digitally signed message part