Archives
Archives
| From: | "Kevin McCarthy (signals)" <signals@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-im/amsn/files: amsn-0.98.4-amsnplus-ldflags.patch amsn-0.98.4-v4l2.patch |
| Date: | Thu, 28 Apr 2011 15:42:36 |
| Message-Id: | 20110428154227.86E3D20057@flycatcher.gentoo.org |
| 1 | signals 11/04/28 15:42:27 |
| 2 | |
| 3 | Added: amsn-0.98.4-amsnplus-ldflags.patch |
| 4 | amsn-0.98.4-v4l2.patch |
| 5 | Log: |
| 6 | Add v4l2 compatibilty #363201. Build amsnplus/snapshot from source instead of installing the shipped 32-bit binary and add imlib dep required to build it. |
| 7 | |
| 8 | (Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: amsn-0.98.4-amsnplus-ldflags.patch |
| 17 | =================================================================== |
| 18 | Respect LDFLAGS, CFLAGS and CC when building amsnplus/snapshot |
| 19 | |
| 20 | Patch by Kevin McCarthy <signals@g.o> |
| 21 | |
| 22 | --- plugins/amsnplus/Makefile |
| 23 | +++ plugins/amsnplus/Makefile |
| 24 | @@ -1,6 +1,6 @@ |
| 25 | snapshot: |
| 26 | - gcc snapshot.c -o snapshot `imlib-config --cflags` `imlib-config --libs` |
| 27 | + $(CC) $(CFLAGS) $(LDFLAGS) snapshot.c -o snapshot `imlib-config --cflags` `imlib-config --libs` |
| 28 | |
| 29 | all: snapshot |
| 30 | clean: |
| 31 | - rm snapshot |
| 32 | \ No newline at end of file |
| 33 | + rm snapshot |
| 34 | |
| 35 | |
| 36 | |
| 37 | 1.1 net-im/amsn/files/amsn-0.98.4-v4l2.patch |
| 38 | |
| 39 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/files/amsn-0.98.4-v4l2.patch?rev=1.1&view=markup |
| 40 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/files/amsn-0.98.4-v4l2.patch?rev=1.1&content-type=text/plain |
| 41 | |
| 42 | Index: amsn-0.98.4-v4l2.patch |
| 43 | =================================================================== |
| 44 | Add support for v4l2 on Linux so it can compile against modern |
| 45 | kernel headers. #363201 |
| 46 | |
| 47 | Patch by Kevin McCarthy <signals@g.o> |
| 48 | |
| 49 | --- configure.ac |
| 50 | +++ configure.ac |
| 51 | @@ -382,6 +382,10 @@ |
| 52 | AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) |
| 53 | fi |
| 54 | |
| 55 | +if test "$FOUND_OS" = "linux"; then |
| 56 | + AC_CHECK_HEADERS(linux/videodev2.h) |
| 57 | +fi |
| 58 | + |
| 59 | #--------------------------------------------------------------------------------------------- |
| 60 | |
| 61 | dnl --------------------------------------------------------------------- |
| 62 | --- utils/linux/capture/capture.h |
| 63 | +++ utils/linux/capture/capture.h |
| 64 | @@ -33,7 +33,11 @@ |
| 65 | #ifdef HAVE_SYS_VIDEODEV2_H |
| 66 | # include <sys/videodev2.h> |
| 67 | #else |
| 68 | -# include <linux/videodev.h> |
| 69 | + #ifdef HAVE_LINUX_VIDEODEV2_H |
| 70 | + #include <linux/videodev2.h> |
| 71 | + #else |
| 72 | + #include <linux/videodev.h> |
| 73 | + #endif |
| 74 | #endif |
| 75 | |
| 76 | #include "grab-ng.h" |