rpms/OpenEXR_Viewers-nonfree/devel OpenEXR_Viewers-nonfree.spec, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28770
Modified Files:
OpenEXR_Viewers-nonfree.spec
Log Message:
- Fix: we are -nonfree
- Cg only exist on i386 x86_64
Index: OpenEXR_Viewers-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/OpenEXR_Viewers-nonfree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenEXR_Viewers-nonfree.spec 15 Oct 2008 14:25:27 -0000 1.1
+++ OpenEXR_Viewers-nonfree.spec 15 Oct 2008 14:40:05 -0000 1.2
@@ -12,7 +12,7 @@
Name: %{real_name}
Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Viewers programs for OpenEXR
Group: Applications/Multimedia
@@ -26,6 +26,7 @@
BuildRequires: OpenEXR_CTL
BuildRequires: fltk-devel
%if %with_Cg
+ExclusiveArch: i386 x86_64
BuildRequires: Cg
BuildRequires: freeglut-devel
Provides: OpenEXR_Viewers = %{version}
@@ -51,7 +52,7 @@
the current discussions at the AMPAS Image Interchange Framework committee
(September 2006).
-This is the freeworld version compiled with nVidia Cg support
+This is the nonfree version compiled with nVidia Cg support
See: http://developer.nvidia.com/object/cg_toolkit.html
%else
@@ -124,6 +125,10 @@
%endif
%changelog
+* Wed Oct 15 2008 kwizart < kwizart at gmail.com > - 1.0.1-3
+- Fix: we are -nonfree
+- Cg only exist on i386 x86_64
+
* Sat May 10 2008 kwizart < kwizart at gmail.com > - 1.0.1-2
- Ghost the alternative provides
- Obsoletes OpenEXR-utils
16 years
rpms/OpenEXR_Viewers-nonfree/devel OpenEXR_Viewers-nonfree.spec, NONE, 1.1 openexr_viewers-1.0.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27862/devel
Modified Files:
.cvsignore sources
Added Files:
OpenEXR_Viewers-nonfree.spec openexr_viewers-1.0.1-gcc43.patch
Log Message:
-Import for Rawhide
--- NEW FILE OpenEXR_Viewers-nonfree.spec ---
# nVidia Cg toolkit is not free
%define with_Cg 1
%if %with_Cg
%define real_name OpenEXR_Viewers-nonfree
%define V_suffix -nonfree
%define priority 10
%else
%define real_name OpenEXR_Viewers
%define V_suffix -fedora
%define priority 5
%endif
Name: %{real_name}
Version: 1.0.1
Release: 2%{?dist}
Summary: Viewers programs for OpenEXR
Group: Applications/Multimedia
License: AMPAS BSD
URL: http://www.openexr.com
Source0: http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-%{ve...
Patch0: openexr_viewers-1.0.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: OpenEXR_CTL-devel
BuildRequires: OpenEXR_CTL
BuildRequires: fltk-devel
%if %with_Cg
BuildRequires: Cg
BuildRequires: freeglut-devel
Provides: OpenEXR_Viewers = %{version}
%else
BuildConflicts: Cg
%endif
# Last version was in F-7 - Can be dropped in F-10
Obsoletes: OpenEXR-utils < 1.6.0
Requires: OpenEXR_CTL
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
%description
exrdisplay is a simple still image viewer that optionally applies color
transforms to OpenEXR images, using ctl as explained in this document:
doc/OpenEXRViewers.pdf
%if %with_Cg
playexr is a program that plays back OpenEXR image sequences, optionally
with CTL support, applying rendering and display transforms in line with
the current discussions at the AMPAS Image Interchange Framework committee
(September 2006).
This is the freeworld version compiled with nVidia Cg support
See: http://developer.nvidia.com/object/cg_toolkit.html
%else
%package docs
Summary: Documentation for %{name}
Group: Documentation
%description docs
This package contains documentation files for %{name}.
%endif
%prep
%setup -q -n openexr_viewers-%{version}
%patch0 -p1 -b .gcc43
%build
export CXXFLAGS="$RPM_OPT_FLAGS -L%{_libdir}"
%configure --disable-static \
%if %with_Cg
--with-cg-prefix=%{_prefix}
%endif
# Missing libs for playexr
sed -i -e 's|LIBS =|LIBS = -lglut|' playexr/Makefile
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove the config.h - uneeded afaik
rm -rf $RPM_BUILD_ROOT%{_includedir}
# move the binary
mv $RPM_BUILD_ROOT%{_bindir}/exrdisplay $RPM_BUILD_ROOT%{_bindir}/exrdisplay%{V_suffix}
# Removing installed docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
# Owernship of the alternative provides
touch $RPM_BUILD_ROOT%{_bindir}/exrdisplay
%clean
rm -rf $RPM_BUILD_ROOT
%post
alternatives --install %{_bindir}/exrdisplay exrdisplay %{_bindir}/exrdisplay%{V_suffix} %{priority} ||:
%preun
if [ $1 -eq 0 ]; then
alternatives --remove exrdisplay %{_bindir}/exrdisplay%{V_suffix} || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%ghost %{_bindir}/exrdisplay
%{_bindir}/exrdisplay%{V_suffix}
%if %with_Cg
%{_bindir}/playexr
%else
%files docs
%defattr(-,root,root,-)
%doc doc/OpenEXRViewers.odt doc/OpenEXRViewers.pdf
%endif
%changelog
* Sat May 10 2008 kwizart < kwizart at gmail.com > - 1.0.1-2
- Ghost the alternative provides
- Obsoletes OpenEXR-utils
* Wed Jan 9 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Initial package for Fedora
openexr_viewers-1.0.1-gcc43.patch:
--- NEW FILE openexr_viewers-1.0.1-gcc43.patch ---
diff -up openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43 openexr_viewers-1.0.1/exrdisplay/applyCtl.h
--- openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43 2006-12-09 01:14:07.000000000 +0100
+++ openexr_viewers-1.0.1/exrdisplay/applyCtl.h 2008-01-10 02:07:14.000000000 +0100
@@ -49,6 +49,7 @@
#include <ImfArray.h>
#include <ImfHeader.h>
#include <vector>
+#include <cstdlib>
//
// Apply a series of CTL transforms to the raw pixel data from an image file
diff -up openexr_viewers-1.0.1/configure.ac.gcc43 openexr_viewers-1.0.1/configure.ac
--- openexr_viewers-1.0.1/configure.ac.gcc43 2007-10-10 00:20:51.000000000 +0200
+++ openexr_viewers-1.0.1/configure.ac 2008-01-10 02:07:14.000000000 +0100
@@ -126,6 +126,7 @@ AM_COMPILELINKRUN(
#include <ImfFrameBuffer.h>
#include <ImathBox.h>
#include <vector>
+#include <cstdlib>
using namespace Ctl;
using namespace Imf;
using namespace Imath;
diff -up openexr_viewers-1.0.1/configure.gcc43 openexr_viewers-1.0.1/configure
--- openexr_viewers-1.0.1/configure.gcc43 2007-10-10 00:21:01.000000000 +0200
+++ openexr_viewers-1.0.1/configure 2008-01-10 02:07:14.000000000 +0100
@@ -20869,6 +20869,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <ImfFrameBuffer.h>
#include <ImathBox.h>
#include <vector>
+#include <cstdlib>
using namespace Ctl;
using namespace Imf;
using namespace Imath;
diff -up openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43 openexr_viewers-1.0.1/playexr/ctlToLut.h
--- openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43 2008-01-10 03:09:55.000000000 +0100
+++ openexr_viewers-1.0.1/playexr/ctlToLut.h 2008-01-10 03:11:18.000000000 +0100
@@ -88,6 +88,7 @@
#include <string>
#include <vector>
#include <half.h>
+#include <cstdlib>
void
diff -up openexr_viewers-1.0.1/playexr/main.cpp.gcc43 openexr_viewers-1.0.1/playexr/main.cpp
--- openexr_viewers-1.0.1/playexr/main.cpp.gcc43 2008-01-10 03:05:03.000000000 +0100
+++ openexr_viewers-1.0.1/playexr/main.cpp 2008-01-10 03:05:48.000000000 +0100
@@ -48,6 +48,7 @@
#include <vector>
#include <string>
#include <stdlib.h>
+#include <cstring>
using namespace std;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Oct 2008 14:48:22 -0000 1.1
+++ .cvsignore 15 Oct 2008 14:25:27 -0000 1.2
@@ -0,0 +1 @@
+openexr_viewers-1.0.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Oct 2008 14:48:22 -0000 1.1
+++ sources 15 Oct 2008 14:25:27 -0000 1.2
@@ -0,0 +1 @@
+e7b77c320a00cd89ef50605ba2a374cd openexr_viewers-1.0.1.tar.gz
16 years
rpms/gstreamer-ffmpeg/F-9 .cvsignore, 1.3, 1.4 gstreamer-ffmpeg.spec, 1.6, 1.7 sources, 1.3, 1.4 gst-ffmpeg-0.10.3-no-ffdec_faad.patch, 1.2, NONE gst-ffmpeg-0.10.4-av_picture_copy.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22862
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Removed Files:
gst-ffmpeg-0.10.3-no-ffdec_faad.patch
gst-ffmpeg-0.10.4-av_picture_copy.patch
Log Message:
* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-1.fc9.1
- New upstream release 0.10.5
- Drop all patches, all upstreamed <yeah>
- Put .1 behind disttag to be newer then freshrpms, yet older then F-10 version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 24 Jul 2008 09:13:23 -0000 1.3
+++ .cvsignore 15 Oct 2008 12:57:38 -0000 1.4
@@ -1 +1 @@
-gst-ffmpeg-0.10.4.tar.bz2
+gst-ffmpeg-0.10.5.tar.bz2
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-9/gstreamer-ffmpeg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer-ffmpeg.spec 16 Aug 2008 18:14:51 -0000 1.6
+++ gstreamer-ffmpeg.spec 15 Oct 2008 12:57:38 -0000 1.7
@@ -1,20 +1,16 @@
Name: gstreamer-ffmpeg
-Version: 0.10.4
-Release: 2%{?dist}.1
+Version: 0.10.5
+Release: 1%{?dist}.1
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
License: GPLv2+ and LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar...
-# submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=534392
-Patch1: gst-ffmpeg-0.10.3-no-ffdec_faad.patch
-# submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=534390
-Patch2: gst-ffmpeg-0.10.4-av_picture_copy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires: ffmpeg-devel liboil-devel
+BuildRequires: ffmpeg-devel liboil-devel bzip2-devel
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -29,8 +25,6 @@
%prep
%setup -q -n gst-ffmpeg-%{version}
-%patch1 -p1
-%patch2 -p1
# adjust includes for the header move in latest ffmpeg <sigh>
sed -i -e 's|ffmpeg/avcodec.h|ffmpeg/libavcodec/avcodec.h|g' \
-e 's|ffmpeg/avformat.h|ffmpeg/libavformat/avformat.h|g' \
@@ -65,8 +59,10 @@
%changelog
-* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.4-2.fc9.1
-- Fix build with new ffmpeg
+* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-1.fc9.1
+- New upstream release 0.10.5
+- Drop all patches, all upstreamed <yeah>
+- Put .1 behind disttag to be newer then freshrpms, yet older then F-10 version
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.4-2
- Release bump for rpmfusion build
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 24 Jul 2008 09:13:23 -0000 1.3
+++ sources 15 Oct 2008 12:57:38 -0000 1.4
@@ -1 +1 @@
-761cbbc0b5f077449082d0ea7527941e gst-ffmpeg-0.10.4.tar.bz2
+1ff579945eafcfddab420b734c3a0c92 gst-ffmpeg-0.10.5.tar.bz2
--- gst-ffmpeg-0.10.3-no-ffdec_faad.patch DELETED ---
--- gst-ffmpeg-0.10.4-av_picture_copy.patch DELETED ---
16 years
rpms/iscsitarget/F-9 iscsitarget-0.4.15-qelem.patch, NONE, 1.1 iscsitarget.spec, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/iscsitarget/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19928
Modified Files:
iscsitarget.spec
Added Files:
iscsitarget-0.4.15-qelem.patch
Log Message:
* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1:0.4.15-11.svn142
- Fix building with latest glibc (needs _GNU_SOURCE to be defined)
iscsitarget-0.4.15-qelem.patch:
--- NEW FILE iscsitarget-0.4.15-qelem.patch ---
diff -up iscsitarget-0.4.15/usr/iscsid.h.qelem iscsitarget-0.4.15/usr/iscsid.h
--- iscsitarget-0.4.15/usr/iscsid.h.qelem 2006-09-25 11:08:51.000000000 +0200
+++ iscsitarget-0.4.15/usr/iscsid.h 2008-10-15 13:55:01.000000000 +0200
@@ -32,7 +32,7 @@ struct PDU {
#define KEY_STATE_DONE 2
struct session {
- struct qelem slist;
+ struct q_elem slist;
char *initiator;
struct target *target;
@@ -122,9 +122,9 @@ struct connection {
#define INCOMING_BUFSIZE 8192
struct target {
- struct qelem tlist;
+ struct q_elem tlist;
- struct qelem sessions_list;
+ struct q_elem sessions_list;
u32 tid;
char name[ISCSI_NAME_LEN];
@@ -133,7 +133,7 @@ struct target {
int max_nr_sessions;
int nr_sessions;
- struct qelem isns_head;
+ struct q_elem isns_head;
};
/* chap.c */
@@ -180,7 +180,7 @@ extern void session_create(struct connec
extern void session_remove(struct session *session);
/* target.c */
-extern struct qelem targets_list;
+extern struct q_elem targets_list;
extern int target_add(u32 *, char *);
extern int target_del(u32);
extern u32 target_find_by_name(const char *name);
diff -up iscsitarget-0.4.15/usr/isns.c.qelem iscsitarget-0.4.15/usr/isns.c
--- iscsitarget-0.4.15/usr/isns.c.qelem 2008-10-15 13:50:14.000000000 +0200
+++ iscsitarget-0.4.15/usr/isns.c 2008-10-15 13:55:01.000000000 +0200
@@ -44,12 +44,12 @@ struct isns_io {
struct isns_qry_mgmt {
char name[ISCSI_NAME_LEN];
uint16_t transaction;
- struct qelem qlist;
+ struct q_elem qlist;
};
struct isns_initiator {
char name[ISCSI_NAME_LEN];
- struct qelem ilist;
+ struct q_elem ilist;
};
static LIST_HEAD(qry_list);
diff -up iscsitarget-0.4.15/usr/misc.h.qelem iscsitarget-0.4.15/usr/misc.h
--- iscsitarget-0.4.15/usr/misc.h.qelem 2006-08-15 01:58:34.000000000 +0200
+++ iscsitarget-0.4.15/usr/misc.h 2008-10-15 13:55:01.000000000 +0200
@@ -5,9 +5,9 @@
#ifndef MISC_H
#define MISC_H
-struct qelem {
- struct qelem *q_forw;
- struct qelem *q_back;
+struct q_elem {
+ struct q_elem *q_forw;
+ struct q_elem *q_back;
};
/* stolen list stuff from Linux kernel */
@@ -21,18 +21,18 @@ struct qelem {
#define LIST_HEAD_INIT(name) { &(name), &(name) }
#define LIST_HEAD(name) \
- struct qelem name = LIST_HEAD_INIT(name)
+ struct q_elem name = LIST_HEAD_INIT(name)
#define INIT_LIST_HEAD(ptr) do { \
(ptr)->q_forw = (ptr); (ptr)->q_back = (ptr); \
} while (0)
-static inline int list_empty(const struct qelem *head)
+static inline int list_empty(const struct q_elem *head)
{
return head->q_forw == head;
}
-static inline int list_length_is_one(const struct qelem *head)
+static inline int list_length_is_one(const struct q_elem *head)
{
return head->q_forw == head->q_back;
}
diff -up iscsitarget-0.4.15/usr/plain.c.qelem iscsitarget-0.4.15/usr/plain.c
--- iscsitarget-0.4.15/usr/plain.c.qelem 2007-04-10 09:44:48.000000000 +0200
+++ iscsitarget-0.4.15/usr/plain.c 2008-10-15 13:55:01.000000000 +0200
@@ -31,7 +31,7 @@
*/
struct user {
- struct qelem ulist;
+ struct q_elem ulist;
u32 tid;
char *name;
@@ -62,18 +62,18 @@ static struct iscsi_key user_keys[] = {
{NULL,},
};
-static struct qelem discovery_users_in = LIST_HEAD_INIT(discovery_users_in);
-static struct qelem discovery_users_out = LIST_HEAD_INIT(discovery_users_out);
+static struct q_elem discovery_users_in = LIST_HEAD_INIT(discovery_users_in);
+static struct q_elem discovery_users_out = LIST_HEAD_INIT(discovery_users_out);
#define HASH_ORDER 4
#define acct_hash(x) ((x) & ((1 << HASH_ORDER) - 1))
-static struct qelem trgt_acct_in[1 << HASH_ORDER];
-static struct qelem trgt_acct_out[1 << HASH_ORDER];
+static struct q_elem trgt_acct_in[1 << HASH_ORDER];
+static struct q_elem trgt_acct_out[1 << HASH_ORDER];
-static struct qelem *account_list_get(u32 tid, int dir)
+static struct q_elem *account_list_get(u32 tid, int dir)
{
- struct qelem *list = NULL;
+ struct q_elem *list = NULL;
if (tid) {
list = (dir == AUTH_DIR_INCOMING) ?
@@ -125,7 +125,7 @@ static int plain_account_init(char *file
/* Return the first account if the length of name is zero */
static struct user *account_lookup_by_name(u32 tid, int dir, char *name)
{
- struct qelem *list = account_list_get(tid, dir);
+ struct q_elem *list = account_list_get(tid, dir);
struct user *user = NULL;
list_for_each_entry(user, list, ulist) {
@@ -196,7 +196,7 @@ static int plain_account_add(u32 tid, in
{
int err = -ENOMEM;
struct user *user;
- struct qelem *list;
+ struct q_elem *list;
if (!name || !pass)
return -EINVAL;
diff -up iscsitarget-0.4.15/usr/target.c.qelem iscsitarget-0.4.15/usr/target.c
--- iscsitarget-0.4.15/usr/target.c.qelem 2006-08-29 15:04:24.000000000 +0200
+++ iscsitarget-0.4.15/usr/target.c 2008-10-15 13:55:01.000000000 +0200
@@ -14,7 +14,7 @@
#include "iscsid.h"
-struct qelem targets_list = LIST_HEAD_INIT(targets_list);
+struct q_elem targets_list = LIST_HEAD_INIT(targets_list);
void target_list_build(struct connection *conn, char *addr, char *name)
{
Index: iscsitarget.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget/F-9/iscsitarget.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsitarget.spec 3 Oct 2008 13:57:10 -0000 1.1
+++ iscsitarget.spec 15 Oct 2008 12:02:23 -0000 1.2
@@ -2,7 +2,7 @@
Name: iscsitarget
Version: 0.4.15
-Release: 10.%{patchlevel}%{?dist}
+Release: 11.%{patchlevel}%{?dist}
Epoch: 1
Summary: Utilities for iSCSI Enterprise Target
@@ -15,6 +15,8 @@
# http://svn.berlios.de/svnroot/repos/iscsitarget/trunk/@142
Patch0: iscsitarget-0.4.15-%{patchlevel}.patch
Patch1: iscsitarget-0.4.15-initscript.patch
+# rename qelem to q_elem to avoid name clash with glibc qelem
+Patch2: iscsitarget-0.4.15-qelem.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-kmod >= %{epoch}:%{version}
@@ -36,10 +38,11 @@
%setup -q
%patch0 -p0 -b .%{patchlevel}
%patch1 -p1 -b .initscript
+%patch2 -p1 -b .qelem
%build
-make CFLAGS="%{optflags} -I../include" -C usr %{?_smp_flags}
+make CFLAGS="%{optflags} -I../include -D_GNU_SOURCE" -C usr %{?_smp_flags}
%install
@@ -80,6 +83,9 @@
%changelog
+* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1:0.4.15-11.svn142
+- Fix building with latest glibc (needs _GNU_SOURCE to be defined)
+
* Fri Oct 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:0.4.15-10.svn142
- rebuild for rpm fusion
16 years
rpms/iscsitarget/devel iscsitarget-0.4.15-qelem.patch, NONE, 1.1 iscsitarget.spec, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/iscsitarget/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19789
Modified Files:
iscsitarget.spec
Added Files:
iscsitarget-0.4.15-qelem.patch
Log Message:
* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1:0.4.15-11.svn142
- Fix building with latest glibc (needs _GNU_SOURCE to be defined)
iscsitarget-0.4.15-qelem.patch:
--- NEW FILE iscsitarget-0.4.15-qelem.patch ---
diff -up iscsitarget-0.4.15/usr/iscsid.h.qelem iscsitarget-0.4.15/usr/iscsid.h
--- iscsitarget-0.4.15/usr/iscsid.h.qelem 2006-09-25 11:08:51.000000000 +0200
+++ iscsitarget-0.4.15/usr/iscsid.h 2008-10-15 13:55:01.000000000 +0200
@@ -32,7 +32,7 @@ struct PDU {
#define KEY_STATE_DONE 2
struct session {
- struct qelem slist;
+ struct q_elem slist;
char *initiator;
struct target *target;
@@ -122,9 +122,9 @@ struct connection {
#define INCOMING_BUFSIZE 8192
struct target {
- struct qelem tlist;
+ struct q_elem tlist;
- struct qelem sessions_list;
+ struct q_elem sessions_list;
u32 tid;
char name[ISCSI_NAME_LEN];
@@ -133,7 +133,7 @@ struct target {
int max_nr_sessions;
int nr_sessions;
- struct qelem isns_head;
+ struct q_elem isns_head;
};
/* chap.c */
@@ -180,7 +180,7 @@ extern void session_create(struct connec
extern void session_remove(struct session *session);
/* target.c */
-extern struct qelem targets_list;
+extern struct q_elem targets_list;
extern int target_add(u32 *, char *);
extern int target_del(u32);
extern u32 target_find_by_name(const char *name);
diff -up iscsitarget-0.4.15/usr/isns.c.qelem iscsitarget-0.4.15/usr/isns.c
--- iscsitarget-0.4.15/usr/isns.c.qelem 2008-10-15 13:50:14.000000000 +0200
+++ iscsitarget-0.4.15/usr/isns.c 2008-10-15 13:55:01.000000000 +0200
@@ -44,12 +44,12 @@ struct isns_io {
struct isns_qry_mgmt {
char name[ISCSI_NAME_LEN];
uint16_t transaction;
- struct qelem qlist;
+ struct q_elem qlist;
};
struct isns_initiator {
char name[ISCSI_NAME_LEN];
- struct qelem ilist;
+ struct q_elem ilist;
};
static LIST_HEAD(qry_list);
diff -up iscsitarget-0.4.15/usr/misc.h.qelem iscsitarget-0.4.15/usr/misc.h
--- iscsitarget-0.4.15/usr/misc.h.qelem 2006-08-15 01:58:34.000000000 +0200
+++ iscsitarget-0.4.15/usr/misc.h 2008-10-15 13:55:01.000000000 +0200
@@ -5,9 +5,9 @@
#ifndef MISC_H
#define MISC_H
-struct qelem {
- struct qelem *q_forw;
- struct qelem *q_back;
+struct q_elem {
+ struct q_elem *q_forw;
+ struct q_elem *q_back;
};
/* stolen list stuff from Linux kernel */
@@ -21,18 +21,18 @@ struct qelem {
#define LIST_HEAD_INIT(name) { &(name), &(name) }
#define LIST_HEAD(name) \
- struct qelem name = LIST_HEAD_INIT(name)
+ struct q_elem name = LIST_HEAD_INIT(name)
#define INIT_LIST_HEAD(ptr) do { \
(ptr)->q_forw = (ptr); (ptr)->q_back = (ptr); \
} while (0)
-static inline int list_empty(const struct qelem *head)
+static inline int list_empty(const struct q_elem *head)
{
return head->q_forw == head;
}
-static inline int list_length_is_one(const struct qelem *head)
+static inline int list_length_is_one(const struct q_elem *head)
{
return head->q_forw == head->q_back;
}
diff -up iscsitarget-0.4.15/usr/plain.c.qelem iscsitarget-0.4.15/usr/plain.c
--- iscsitarget-0.4.15/usr/plain.c.qelem 2007-04-10 09:44:48.000000000 +0200
+++ iscsitarget-0.4.15/usr/plain.c 2008-10-15 13:55:01.000000000 +0200
@@ -31,7 +31,7 @@
*/
struct user {
- struct qelem ulist;
+ struct q_elem ulist;
u32 tid;
char *name;
@@ -62,18 +62,18 @@ static struct iscsi_key user_keys[] = {
{NULL,},
};
-static struct qelem discovery_users_in = LIST_HEAD_INIT(discovery_users_in);
-static struct qelem discovery_users_out = LIST_HEAD_INIT(discovery_users_out);
+static struct q_elem discovery_users_in = LIST_HEAD_INIT(discovery_users_in);
+static struct q_elem discovery_users_out = LIST_HEAD_INIT(discovery_users_out);
#define HASH_ORDER 4
#define acct_hash(x) ((x) & ((1 << HASH_ORDER) - 1))
-static struct qelem trgt_acct_in[1 << HASH_ORDER];
-static struct qelem trgt_acct_out[1 << HASH_ORDER];
+static struct q_elem trgt_acct_in[1 << HASH_ORDER];
+static struct q_elem trgt_acct_out[1 << HASH_ORDER];
-static struct qelem *account_list_get(u32 tid, int dir)
+static struct q_elem *account_list_get(u32 tid, int dir)
{
- struct qelem *list = NULL;
+ struct q_elem *list = NULL;
if (tid) {
list = (dir == AUTH_DIR_INCOMING) ?
@@ -125,7 +125,7 @@ static int plain_account_init(char *file
/* Return the first account if the length of name is zero */
static struct user *account_lookup_by_name(u32 tid, int dir, char *name)
{
- struct qelem *list = account_list_get(tid, dir);
+ struct q_elem *list = account_list_get(tid, dir);
struct user *user = NULL;
list_for_each_entry(user, list, ulist) {
@@ -196,7 +196,7 @@ static int plain_account_add(u32 tid, in
{
int err = -ENOMEM;
struct user *user;
- struct qelem *list;
+ struct q_elem *list;
if (!name || !pass)
return -EINVAL;
diff -up iscsitarget-0.4.15/usr/target.c.qelem iscsitarget-0.4.15/usr/target.c
--- iscsitarget-0.4.15/usr/target.c.qelem 2006-08-29 15:04:24.000000000 +0200
+++ iscsitarget-0.4.15/usr/target.c 2008-10-15 13:55:01.000000000 +0200
@@ -14,7 +14,7 @@
#include "iscsid.h"
-struct qelem targets_list = LIST_HEAD_INIT(targets_list);
+struct q_elem targets_list = LIST_HEAD_INIT(targets_list);
void target_list_build(struct connection *conn, char *addr, char *name)
{
Index: iscsitarget.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget/devel/iscsitarget.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsitarget.spec 3 Oct 2008 13:56:24 -0000 1.1
+++ iscsitarget.spec 15 Oct 2008 11:58:32 -0000 1.2
@@ -2,7 +2,7 @@
Name: iscsitarget
Version: 0.4.15
-Release: 10.%{patchlevel}%{?dist}
+Release: 11.%{patchlevel}%{?dist}
Epoch: 1
Summary: Utilities for iSCSI Enterprise Target
@@ -15,6 +15,8 @@
# http://svn.berlios.de/svnroot/repos/iscsitarget/trunk/@142
Patch0: iscsitarget-0.4.15-%{patchlevel}.patch
Patch1: iscsitarget-0.4.15-initscript.patch
+# rename qelem to q_elem to avoid name clash with glibc qelem
+Patch2: iscsitarget-0.4.15-qelem.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-kmod >= %{epoch}:%{version}
@@ -36,10 +38,11 @@
%setup -q
%patch0 -p0 -b .%{patchlevel}
%patch1 -p1 -b .initscript
+%patch2 -p1 -b .qelem
%build
-make CFLAGS="%{optflags} -I../include" -C usr %{?_smp_flags}
+make CFLAGS="%{optflags} -I../include -D_GNU_SOURCE" -C usr %{?_smp_flags}
%install
@@ -80,6 +83,9 @@
%changelog
+* Wed Oct 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1:0.4.15-11.svn142
+- Fix building with latest glibc (needs _GNU_SOURCE to be defined)
+
* Fri Oct 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:0.4.15-10.svn142
- rebuild for rpm fusion
16 years
rpms/mythtv/devel mythtv-0.21-enable-64bit-fast_cmov.patch, NONE, 1.1 mythtv.spec, 1.9, 1.10
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22522
Modified Files:
mythtv.spec
Added Files:
mythtv-0.21-enable-64bit-fast_cmov.patch
Log Message:
* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
- Enable fast cmov on x86_64
- Disable mythgame-emulators convenience meta-package, deps not
available in the free repo (if available at all)
mythtv-0.21-enable-64bit-fast_cmov.patch:
--- NEW FILE mythtv-0.21-enable-64bit-fast_cmov.patch ---
Index: mythtv/configure
===================================================================
--- mythtv/configure (revision 18567)
+++ mythtv/configure (working copy)
@@ -1488,6 +1488,7 @@
fi
fi
cmov="yes"
+ fast_cmov="yes"
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mythtv.spec 6 Oct 2008 18:44:17 -0000 1.9
+++ mythtv.spec 15 Oct 2008 03:52:19 -0000 1.10
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 12%{?dist}
+Release: 13%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -45,6 +45,7 @@
Patch100: mythtv-0.21-svnfixes.patch
Patch101: mythtv-0.20-mythstreammenu.diff
#Patch102: mythtv-0.21-fedora-settings.patch
+Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
Patch202: mythmusic-busted-cdparanoia-workaround.patch
@@ -370,21 +371,21 @@
%description -n mythgame
A game frontend (xmame, nes, snes, pc) for MythTV.
-%package -n mythgame-emulators
-Summary: Meta-package requiring emulators for game types mythgame knows about
-Group: Applications/Multimedia
-Requires: mythgame = %{version}-%{release}
+#package -n mythgame-emulators
+#Summary: Meta-package requiring emulators for game types mythgame knows about
+#Group: Applications/Multimedia
+#Requires: mythgame = %{version}-%{release}
# Multi Arcade Machine Emulator, Amiga, Atari 2600
-Requires: sdlmame, e-uae, stella
+#Requires: sdlmame, e-uae, stella
# Nintendo, Super Nintendo, Nintendo 64
-Requires: fceultra, zsnes, mupen64, mupen64-ricevideo
+#Requires: fceultra, zsnes, mupen64, mupen64-ricevideo
# Sega Genesis, Sega Master System, Game Gear
-Requires: gens, dega-sdl, osmose
+#Requires: gens, dega-sdl, osmose
# TurboGraphx 16 (and others)
-Requires: mednafen
+#Requires: mednafen
-%description -n mythgame-emulators
-Meta-package requiring emulators for game types mythgame knows about.
+#description -n mythgame-emulators
+#Meta-package requiring emulators for game types mythgame knows about.
%package -n mythnews
Summary: An RSS news feed plugin for MythTV
@@ -493,6 +494,7 @@
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
+%patch103 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -593,7 +595,7 @@
--enable-audio-jack \
--enable-xvmc --enable-xvmcw \
%if %with_xvmcnvidia
- --xvmc-lib=XvMCNVIDIA_dynamic --enable-xvmc-opengl \
+ --xvmc-lib=XvMCNVIDIA --enable-xvmc-opengl \
%else
%ifarch %{ix86} x86_64
--enable-xvmc-vld --enable-xvmc-pro \
@@ -918,11 +920,11 @@
%{_datadir}/mythtv/game_settings.xml
%{_datadir}/mythtv/i18n/mythgame_*.qm
-%files -n mythgame-emulators
-%defattr(-,root,root,-)
-%{_datadir}/mythtv/games/xmame
-%{_datadir}/mame/screens
-%{_datadir}/mame/flyers
+#files -n mythgame-emulators
+#defattr(-,root,root,-)
+#{_datadir}/mythtv/games/xmame
+#{_datadir}/mame/screens
+#{_datadir}/mame/flyers
%files -n mythnews
%defattr(-,root,root,-)
@@ -1016,6 +1018,11 @@
%endif
%changelog
+* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
+- Enable fast cmov on x86_64
+- Disable mythgame-emulators convenience meta-package, deps not
+ available in the free repo (if available at all)
+
* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
- Update release-0-21-fixes patches (r18567)
16 years
rpms/mplayer/F-9 mplayer-snapshot.sh,NONE,1.1
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1257
Added Files:
mplayer-snapshot.sh
Log Message:
add missing script
--- NEW FILE mplayer-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
dirname=mplayer-export-$svn
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
cd $dirname
for dir in libav* libpostproc ; do
cd $dir
svn update -r {$svn}
cd ..
done
svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
sed -i -e 's/\(SVN-r[0-9]* \)/\1rpmfusion /' -e "s/UNKNOWN/$svn_revision/" version.sh
find . -type d -name .svn -print0 | xargs -0r rm -rf
cd ..
tar jcf "$pwd"/$dirname.tar.bz2 $dirname
cd - >/dev/null
16 years
rpms/OpenEXR_Viewers-nonfree/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvsj10610/rpms/OpenEXR_Viewers-nonfree/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module OpenEXR_Viewers-nonfree
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: OpenEXR_Viewers-nonfree
# $Id: Makefile,v 1.1 2008/10/14 14:48:22 laxathom Exp $
NAME := OpenEXR_Viewers-nonfree
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years
rpms/OpenEXR_Viewers-nonfree Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvsj10610/rpms/OpenEXR_Viewers-nonfree
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module OpenEXR_Viewers-nonfree
--- NEW FILE Makefile ---
# Top level Makefile for module OpenEXR_Viewers-nonfree
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years
rpms/OpenEXR_Viewers-nonfree/devel - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvsj10610/rpms/OpenEXR_Viewers-nonfree/devel
Log Message:
Directory /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel added to the repository
16 years
