[amsn/f17] Finally have a working version, with webcam

Sander Hoentjen tjikkun at fedoraproject.org
Mon Jul 16 19:04:40 UTC 2012


commit c72a8847783cba309bca0665a4f2a3538fddfaf1
Author: Sander Hoentjen <sander at hoentjen.eu>
Date:   Mon Jul 16 21:03:44 2012 +0200

    Finally have a working version, with webcam

 amsn-0.98.9-chrpath.patch |   22 ++++++++++++++++++++++
 amsn.spec                 |   11 ++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/amsn-0.98.9-chrpath.patch b/amsn-0.98.9-chrpath.patch
new file mode 100644
index 0000000..465ab6c
--- /dev/null
+++ b/amsn-0.98.9-chrpath.patch
@@ -0,0 +1,22 @@
+--- amsn/utils/linux/capture/libng/plugins/Rules.mk	(revision 12409)
++++ amsn/utils/linux/capture/libng/plugins/Rules.mk	(working copy)
+@@ -11,7 +11,7 @@
+ 	rm -f $(TARGETS-plugins) $(capture_dir)/libng/plugins/*.o
+ 
+ $(TARGETS-plugins): CFLAGS+=$(V4L_CFLAGS) -I$(capture_dir) -I$(capture_dir)/libng -I$(capture_dir)/structs
+-$(TARGETS-plugins): LDFLAGS+=$(foreach rp,$(RPATH),"-Wl,-rpath=$(rp)/$(capture_dir)/libng")
++$(TARGETS-plugins): LDFLAGS+=-Wl,-rpath=$(libdir)/amsn/utils/capture/libng
+ $(TARGETS-plugins): MORE_LIBS=-L$(capture_dir)/libng -lng
+ 
+ $(TARGETS-plugins): | $(capture_dir)/libng/libng.so
+--- amsn/utils/linux/capture/Rules.mk	(revision 12409)
++++ amsn/utils/linux/capture/Rules.mk	(working copy)
+@@ -4,7 +4,7 @@
+ $(OBJS-capture): CFLAGS+=-I$(capture_dir) -I$(capture_dir)/libng
+ 
+ $(TARGETS-capture): MORE_LIBS=-L$(capture_dir)/libng -lng
+-$(TARGETS-capture): LDFLAGS+=$(foreach rp,$(RPATH),"-Wl,-rpath=$(rp)/$(capture_dir)/libng")
++$(TARGETS-capture): LDFLAGS+=-Wl,-rpath=$(libdir)/amsn/utils/capture/libng
+ 
+ $(TARGETS-capture): $(OBJS-capture) | $(capture_dir)/libng/libng.so
+ 	@$(echo_link_so)
diff --git a/amsn.spec b/amsn.spec
index 55e075b..ec7c909 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -3,7 +3,7 @@
 
 Name:		amsn
 Version:	0.98.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	MSN Messenger clone for Linux, Mac and Windows
 
 Group:		Applications/Internet
@@ -11,6 +11,7 @@ License:	GPLv2
 URL:		http://www.amsn-project.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 Patch0:		amsn-0.98.1-usesnack.patch
+Patch1:		amsn-0.98.9-chrpath.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@@ -47,6 +48,7 @@ snapshots with your webcam to use as your display picture.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 autoreconf -i -f -v
 
@@ -55,10 +57,6 @@ rm -r skins/default/winicons
 rm -r plugins/music/MusicWin
 rm plugins/amsnplus/snapshot
 
-# for webcam to work these paths need to be added because we move libs around
-%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/%{name}/utils/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
-%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/%{name}/utils/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
-
 %{__sed} -i 's# utils/BWidget-1.9.0##' Makefile.in
 %{__sed} -i 's#soundcommand "play \\$sound"#soundcommand "aplay -q \\$sound"#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
@@ -134,6 +132,9 @@ fi
 
 
 %changelog
+* Mon Jul 16 2012 Sander Hoentjen <sander at hoentjen.eu> 0.98.9-3
+- How hard can it be to get this right? Finally did it.
+
 * Tue Jul 03 2012 Sander Hoentjen <sander at hoentjen.eu> 0.98.9-2
 - We do actually move libs around, so add proper fix for that
 


More information about the scm-commits mailing list