rpms/amsn
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- webcam now works (bug #206674)

Browse source
This commit is contained in:
Sander Hoentjen 2006-11-04 12:58:42 +00:00
commit f2af45b92f
3 changed files with 9 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

22
amsn-0.96-configureac-nolocate.patch
View file

@ -1,22 +0,0 @@
--- msn/configure.ac~ 2006-03-27 08:52:26.000000000 +0200
+++ msn/configure.ac 2006-03-27 08:53:26.000000000 +0200
@@ -129,8 +129,7 @@
/usr/lib64/tcl8.5 \
/usr/lib64/tcl8.5.* \
/usr/local/lib64/tcl8.5 \
- /usr/local/lib64/tcl8.5.* \
- `locate tclConfig.sh`"
+ /usr/local/lib64/tcl8.5.*"
for i in $dirs ; do
@@ -268,8 +267,7 @@
/usr/lib64/tk8.5 \
/usr/lib64/tk8.5.* \
/usr/local/lib64/tk8.5 \
- /usr/local/lib64/tk8.5.* \
- `locate tkConfig.sh`"
+ /usr/local/lib64/tk8.5.*"
for i in $dirs ; do

81
amsn-0.96-tkcximage-locallibs.patch
View file

@ -1,81 +0,0 @@
diff -ur amsn~/Makefile.in amsn/Makefile.in
--- amsn~/Makefile.in 2006-04-28 00:10:17.000000000 +0200
+++ amsn/Makefile.in 2006-05-20 10:37:16.000000000 +0200
@@ -50,7 +50,7 @@
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
LIB_FLAGS := -I. -I$(capture_dir) -I$(capture_dir)/libng -I$(capture_dir)/structs
LIB_FLAGS += -I$(webcamsn_dir)/src -I$(tkcximage_dir)/src -I$(tkcximage_dir)/src/CxImage
-LIB_FLAGS += -I$(tkcximage_dir)/src/zlib -I$(tkcximage_dir)/src/png -I$(tkcximage_dir)/src/jpeg
+LIB_FLAGS += -Ipng -Ijpeg
LIBDIR := @LIBDIR@
@@ -100,7 +100,7 @@
CXXFLAGS += -fPIC
# libraries
-LDLIBS := @LDLIBS@
+LDLIBS := @LDLIBS@ -lpng -ljpeg
LDFLAGS := @LDFLAGS@
ifeq (@DEBUG@,no)
LDFLAGS += -s
@@ -224,9 +224,6 @@
include $(tkcximage_dir)/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(tkcximage_dir)/src/CxImage/Rules.mk
-include $(tkcximage_dir)/src/zlib/Rules.mk
-include $(tkcximage_dir)/src/png/Rules.mk
-include $(tkcximage_dir)/src/jpeg/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(webcamsn_dir)/Rules.mk
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp amsn/utils/TkCximage/src/CxImage/ximajpg.cpp
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-05-18 23:03:20.000000000 +0200
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_JPG
-#include "../jpeg/jmorecfg.h"
+#include <jmorecfg.h>
#include "ximaiter.h"
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.h amsn/utils/TkCximage/src/CxImage/ximajpg.h
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.h 2006-05-19 10:12:38.000000000 +0200
@@ -29,8 +29,8 @@
#define CXIMAGEJPG_SUPPORT_EXIF 1
extern "C" {
- #include "../jpeg/jpeglib.h"
- #include "../jpeg/jerror.h"
+ #include <jpeglib.h>
+ #include <jerror.h>
}
class DLL_EXP CxImageJPG: public CxImage
diff -ur amsn~/utils/TkCximage/src/CxImage/ximapng.h amsn/utils/TkCximage/src/CxImage/ximapng.h
--- amsn~/utils/TkCximage/src/CxImage/ximapng.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximapng.h 2006-05-18 23:04:57.000000000 +0200
@@ -22,7 +22,7 @@
#if CXIMAGE_SUPPORT_PNG
extern "C" {
-#include "../png/png.h"
+#include <png.h>
}
long int inline btohl( long int dword ) {
diff -ur amsn~/utils/TkCximage/src/Rules.mk amsn/utils/TkCximage/src/Rules.mk
--- amsn~/utils/TkCximage/src/Rules.mk 2006-02-02 22:08:21.000000000 +0100
+++ amsn/utils/TkCximage/src/Rules.mk 2006-05-19 09:57:03.000000000 +0200
@@ -1,7 +1,5 @@
OBJS-TkCximage := $(tkcximage_dir)/src/TkCximage.cpp.o $(tkcximage_dir)/src/PhotoFormat.cpp.o \
- $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a \
- $(tkcximage_dir)/src/jpeg/libjpeg.a $(tkcximage_dir)/src/png/libpng.a \
- $(tkcximage_dir)/src/zlib/libzlib.a
+ $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a
ifeq ($(STATIC),yes)
OBJS-TkCximage += libstdc++.a
endif

10
amsn.spec
View file

@ -1,6 +1,6 @@
Name: amsn
Version: 0.96
Release: 1%{?dist}
Release: 2%{?dist}
Summary: MSN Messenger clone for Linux, Mac and Windows
Group: Applications/Internet
@ -33,6 +33,11 @@ snapshots with your webcam to use as your display picture.
%patch1 -p1 -b .1-system-bwidget
rm -r utils/TkCximage/src/{jpeg,png,zlib}
rm -r utils/BWidget-1.7.0
# for webcam to work these paths need to be added because we move libs around
%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
%{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
%{__sed} -i 's#mozilla#htmlview#' config.tcl
%{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
@ -116,6 +121,9 @@ fi
%changelog
* Thu Sep 4 2006 Sander Hoentjen <sander@hoentjen.eu> - 0.96-2
- webcam now works (bug #206674)
* Thu Sep 2 2006 Sander Hoentjen <sander@hoentjen.eu> - 0.96-1
- updated to 0.96 final
- drop nolocate and locallibs patch because they were accepted upstream