rpms/dvd+rw-tools/FC-5 dvd+rw-tools-7.0-phys.patch, NONE, 1.1 dvd+rw-tools-7.0-pthread.patch, NONE, 1.1 dvd+rw-tools.spec, 1.19, 1.20
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 14 17:40:26 UTC 2006
Author: harald
Update of /cvs/dist/rpms/dvd+rw-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13223
Modified Files:
dvd+rw-tools.spec
Added Files:
dvd+rw-tools-7.0-phys.patch dvd+rw-tools-7.0-pthread.patch
Log Message:
new version works finally
dvd+rw-tools-7.0-phys.patch:
growisofs.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE dvd+rw-tools-7.0-phys.patch ---
--- dvd+rw-tools-7.0/growisofs.c 2006-11-21 23:17:08.000000000 -0200
+++ dvd+rw-tools-7.0/growisofs.c.phys 2006-11-21 23:17:18.000000000 -0200
@@ -3096,12 +3096,12 @@ int main (int argc, char *argv[])
#if defined(__unix) || defined(__unix__)
-#if defined(_SC_PAGESIZE) && defined(_SC_AVPHYS_PAGES)
- { size_t phys_mem = (size_t)sysconf(_SC_AVPHYS_PAGES) *
+#if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
+ { size_t phys_mem = (size_t)sysconf(_SC_PHYS_PAGES) *
(size_t)sysconf(_SC_PAGESIZE);
if (phys_mem)
- { phys_mem /= 2; /* normally AVPHYS is a bit smaller, so
+ { phys_mem /= 2; /* normally PHYS is a bit smaller, so
* we commonly land on 1/4 RAM */
while (the_buffer_size > phys_mem) the_buffer_size /= 2;
}
dvd+rw-tools-7.0-pthread.patch:
mp.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE dvd+rw-tools-7.0-pthread.patch ---
--- dvd+rw-tools-7.0/mp.h.pthread 2006-09-23 19:45:50.000000000 +0200
+++ dvd+rw-tools-7.0/mp.h 2006-12-14 15:48:45.000000000 +0100
@@ -31,15 +31,19 @@
#include <sched.h>
#include <semaphore.h>
#include <stdlib.h>
+#include <limits.h>
#define THR_TYPE int
static void *__thread_create(int (*func)(void *),void *arg)
{ pthread_t h;
pthread_attr_t attr;
+ size_t stack_sz;
+
+ stack_sz = (PTHREAD_STACK_MIN > 64*1024) ? PTHREAD_STACK_MIN : 64*1024;
if (pthread_attr_init(&attr)==0 &&
- pthread_attr_setstacksize(&attr,64*1024)==0 &&
+ pthread_attr_setstacksize(&attr,stack_sz)==0 &&
pthread_attr_setscope(&attr,PTHREAD_SCOPE_SYSTEM)==0 &&
pthread_create(&h,&attr,(void *(*)(void *))func,arg)==0 )
return (void *)h;
Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dvd+rw-tools.spec 18 Apr 2006 12:58:16 -0000 1.19
+++ dvd+rw-tools.spec 14 Dec 2006 17:40:23 -0000 1.20
@@ -1,17 +1,17 @@
Summary: Toolchain to master DVD+RW/+R media
Name: dvd+rw-tools
-Version: 6.1
-Release: 0.FC5.2
+Version: 7.0
+Release: 0%{dist}.4
License: GPL
Group: Applications/Multimedia
Source: http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
Source1: index.html
-Patch: dvd+rw-tools-5.17.4.8.6.manpatch
-Patch10: dvd+rw-tools-5.21.4.10.8-excl.patch
+Patch1: dvd+rw-tools-7.0-phys.patch
+Patch2: dvd+rw-tools-7.0-pthread.patch
URL: http://fy.chalmers.se/~appro/linux/DVD+RW/
Requires: mkisofs >= 2.0
BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: kernel-headers
+BuildRequires: kernel-headers m4
%description
Collection of tools to master DVD+RW/+R media. For further
@@ -19,30 +19,23 @@
%prep
%setup -q -n %{name}-%{version}
-%patch -p1 -b .manpatch
-#%patch10 -p1 -b .excl
+%patch1 -p1 -b .phys
+%patch2 -p1 -b .pthread
%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
-make WARN="-DDEFAULT_BUF_SIZE_MB=16"
+make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK"
cp %SOURCE1 index.html
%install
rm -rf %{buildroot}
%makeinstall
-# mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-%{release}
-# mkdir -p %{buildroot}%{_mandir}/man1
-
-# cd %{_builddir}/%{name}-%{version}
-# cp -a growisofs dvd+rw-format dvd+rw-booktype \
-# %{buildroot}%{_prefix}/bin
cp -a index.html \
%{buildroot}%{_docdir}/%{name}-%{version}-%{release}
-# cp -a growisofs.1* %{buildroot}%{_mandir}/man1
%clean
rm -rf %{buildroot}
@@ -54,11 +47,30 @@
%{_mandir}/man1/growisofs.1*
%changelog
-* Tue Apr 18 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.2
+* Thu Dec 14 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.4
+- set pthread stack size according to limit (#215818)
+
+* Wed Dec 13 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.3
+- use _SC_PHYS_PAGES instead of _SC_AVPHYS_PAGES to determine available memory
+- Resolves: rhbz#216794
+
+* Fri Nov 03 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.2
+- define RLIMIT_MEMLOCK, which should resolve the memlock problems
+
+* Thu Oct 26 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.1
+- new version 7.0
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.1-4.1
+- rebuild
+
+* Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 6.1-4
+- more build requirements
+
+* Tue Apr 18 2006 Harald Hoyer <harald at redhat.com> - 6.1-2
- compile with smaller buffer size
- removed O_EXCL patch
-* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.1
+* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-1
- version 6.1
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2.1
More information about the fedora-cvs-commits
mailing list