rpms/camE/devel camE-1.9-cflags.patch,NONE,1.1 camE.spec,1.11,1.12
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Aug 30 09:17:59 UTC 2006
- Previous message (by thread): rpms/gdesklets/devel gdesklets.spec,1.18,1.19
- Next message (by thread): rpms/wine/FC-3 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 wine-rpath.patch, 1.1, 1.2 wine.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125
Modified Files:
camE.spec
Added Files:
camE-1.9-cflags.patch
Log Message:
Fix FC6 build by defining CONFIG_VIDEO_V4L1_COMPAT.
camE-1.9-cflags.patch:
--- NEW FILE camE-1.9-cflags.patch ---
diff -Naupr camE-1.9.orig/Makefile camE-1.9/Makefile
--- camE-1.9.orig/Makefile 2003-06-25 10:16:04.000000000 +0200
+++ camE-1.9/Makefile 2006-08-30 11:15:42.000000000 +0200
@@ -7,7 +7,8 @@ bindir=$(ROOT)${exec_prefix}/bin
mandir=$(ROOT)${prefix}/man
CC=gcc
-CFLAGS=-O3 -g -Wall -I$(srcdir)/.. -I.. -D_GNU_SOURCE `giblib-config --cflags`
+CFLAGS?=-O3 -g -Wall
+CFLAGS+=-I$(srcdir)/.. -I.. -D_GNU_SOURCE `giblib-config --cflags`
INSTALL=/usr/bin/install -c
INSTALL_PROGRAM=${INSTALL}
Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- camE.spec 28 Aug 2006 09:21:03 -0000 1.11
+++ camE.spec 30 Aug 2006 09:17:59 -0000 1.12
@@ -6,6 +6,7 @@
Group: System Environment/Daemons
URL: http://linuxbrit.co.uk/camE/
Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
+Patch0: camE-1.9-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: giblib-devel, curl-devel, zlib-devel
@@ -16,9 +17,11 @@
%prep
%setup
+%patch -p1 -b .cflags
%build
+export CFLAGS="%{optflags} -DCONFIG_VIDEO_V4L1_COMPAT=1"
%{__make} %{?_smp_mflags}
@@ -41,6 +44,8 @@
* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.9-7
- FC6 rebuild.
- Remove imlib2-devel build requirement, as giblib-devel requires it.
+- Add cflags patch to use our optflags.
+- Define CONFIG_VIDEO_V4L1_COMPAT in the CFLAGS to get old v4l1 defines.
* Mon Mar 6 2006 Matthias Saou <http://freshrpms.net/> 1.9-6
- FC5 rebuild.
- Previous message (by thread): rpms/gdesklets/devel gdesklets.spec,1.18,1.19
- Next message (by thread): rpms/wine/FC-3 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 wine-rpath.patch, 1.1, 1.2 wine.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list