rpms/vlc/F-11 sources, 1.15, 1.16 vlc.spec, 1.40, 1.41 vlc-1.0-bugfix-duplicate.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31240
Modified Files:
sources vlc.spec
Removed Files:
vlc-1.0-bugfix-duplicate.patch
Log Message:
Update to 1.0.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 18 Jun 2009 10:28:01 -0000 1.15
+++ sources 7 Jul 2009 11:02:28 -0000 1.16
@@ -1,3 +1 @@
-a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h
-c64e9e104b1eeba838a6c87435c6533c shine.c
-d8cefe26c0b734777c371db163c09bda vlc-1.0.0-rc4.tar.bz2
+fc78904ab5fa73f518d8fe4e852e7f67 vlc-1.0.0.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/vlc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vlc.spec 2 Jul 2009 15:24:46 -0000 1.40
+++ vlc.spec 7 Jul 2009 11:02:28 -0000 1.41
@@ -1,10 +1,8 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-%define _default_patch_fuzz 2
%define with_internal_live555 0
%define live555_date 2008.07.25
-%define vlc_git 0
-%define vlc_rc -rc4
+#define vlc_rc -rc4
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -13,7 +11,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.0
-Release: 0.14rc4%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -29,7 +27,6 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0-bugfix-duplicate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -110,11 +107,12 @@
BuildRequires: mpeg2dec-devel >= 0.3.2
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
-BuildRequires: openslp-devel
+BuildRequires: openslp-devel
+BuildRequires: pcre-devel
BuildRequires: prelink
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 1:4.5.2
BuildRequires: schroedinger-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
@@ -164,6 +162,7 @@
%else
Requires: dejavu-fonts
%endif
+Requires: qt-x11%{_isa} >= 1:4.5.2
%package devel
Summary: Development package for %{name}
@@ -254,13 +253,14 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
-%patch5 -p1 -b .dup
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
+%if 1
rm aclocal.m4 m4/lib*.m4
./bootstrap
+%endif
#missing sources
install -pm 0644 %{SOURCE11} modules/codec/shine
@@ -571,6 +571,9 @@
%changelog
+* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
+- Update to 1.0.0 (Final)
+
* Thu Jul 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.14rc4
- Cherry pick from 1.0-bugfix
- Move xcb modules into main
--- vlc-1.0-bugfix-duplicate.patch DELETED ---
15 years, 4 months
rpms/vlc/devel vlc-1.0-bugfix-duplicate.patch,1.1,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31193
Removed Files:
vlc-1.0-bugfix-duplicate.patch
Log Message:
Clean
--- vlc-1.0-bugfix-duplicate.patch DELETED ---
15 years, 4 months
rpms/vlc/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 vlc.spec, 1.43, 1.44
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30756
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 1.0.0 Final
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 18 Jun 2009 10:27:28 -0000 1.17
+++ .cvsignore 7 Jul 2009 11:00:51 -0000 1.18
@@ -1,3 +1 @@
-enc_base.h
-shine.c
-vlc-1.0.0-rc4.tar.bz2
+vlc-1.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 18 Jun 2009 10:27:28 -0000 1.17
+++ sources 7 Jul 2009 11:00:51 -0000 1.18
@@ -1,3 +1 @@
-a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h
-c64e9e104b1eeba838a6c87435c6533c shine.c
-d8cefe26c0b734777c371db163c09bda vlc-1.0.0-rc4.tar.bz2
+fc78904ab5fa73f518d8fe4e852e7f67 vlc-1.0.0.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vlc.spec 2 Jul 2009 15:24:45 -0000 1.43
+++ vlc.spec 7 Jul 2009 11:00:51 -0000 1.44
@@ -1,10 +1,8 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-%define _default_patch_fuzz 2
%define with_internal_live555 0
%define live555_date 2008.07.25
-%define vlc_git 0
-%define vlc_rc -rc4
+#define vlc_rc -rc4
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -13,7 +11,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.0
-Release: 0.14rc4%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -29,7 +27,6 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0-bugfix-duplicate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -110,11 +107,12 @@
BuildRequires: mpeg2dec-devel >= 0.3.2
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
-BuildRequires: openslp-devel
+BuildRequires: openslp-devel
+BuildRequires: pcre-devel
BuildRequires: prelink
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 1:4.5.2
BuildRequires: schroedinger-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
@@ -164,6 +162,7 @@
%else
Requires: dejavu-fonts
%endif
+Requires: qt-x11%{_isa} >= 1:4.5.2
%package devel
Summary: Development package for %{name}
@@ -254,13 +253,14 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
-%patch5 -p1 -b .dup
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
+%if 1
rm aclocal.m4 m4/lib*.m4
./bootstrap
+%endif
#missing sources
install -pm 0644 %{SOURCE11} modules/codec/shine
@@ -571,6 +571,9 @@
%changelog
+* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
+- Update to 1.0.0 (Final)
+
* Thu Jul 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.14rc4
- Cherry pick from 1.0-bugfix
- Move xcb modules into main
15 years, 4 months
rpms/cairo-dock/F-11 .cvsignore, 1.18, 1.19 cairo-dock.spec, 1.25, 1.26 sources, 1.20, 1.21
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9637/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
- 2.0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 29 Jun 2009 15:01:37 -0000 1.18
+++ .cvsignore 5 Jul 2009 12:49:44 -0000 1.19
@@ -1,2 +1,2 @@
-cairo-dock-2.0.6.tar.bz2
-cairo-dock-plugins-2.0.6.tar.bz2
+cairo-dock-2.0.7.tar.bz2
+cairo-dock-plugins-2.0.7.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cairo-dock.spec 29 Jun 2009 15:01:37 -0000 1.25
+++ cairo-dock.spec 5 Jul 2009 12:49:44 -0000 1.26
@@ -11,7 +11,7 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.6
+%global mainver 2.0.7
%undefine betaver
%global build_themes 0
@@ -83,6 +83,11 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
+# (for now make it sure that buildtree used is correctly synced with rawhide tree
+# and new libxklavier is correctly used)
+%if 0%{?fedora} >= 12
+BuildRequires: libxklavier-devel >= 4.0
+%endif
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -629,6 +634,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
+- 2.0.7
+
+* Thu Jul 2 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- F-12: rebuild against new libxklavier
+
* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp> - 2.0.6-1
- 2.0.6
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 29 Jun 2009 15:01:37 -0000 1.20
+++ sources 5 Jul 2009 12:49:44 -0000 1.21
@@ -1,2 +1,2 @@
-8d0d213e64824445e7a291eb5f16dd45 cairo-dock-2.0.6.tar.bz2
-5444eab4192f980f9ef93d6bc95b1585 cairo-dock-plugins-2.0.6.tar.bz2
+856c7751a9af3bc58ee167dd9b7b5317 cairo-dock-2.0.7.tar.bz2
+e35eaebbaa22340479fad7952d16a14c cairo-dock-plugins-2.0.7.tar.bz2
15 years, 4 months
rpms/cairo-dock/devel .cvsignore, 1.26, 1.27 cairo-dock.spec, 1.33, 1.34 sources, 1.28, 1.29
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9637/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
- 2.0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 2 Jul 2009 11:58:43 -0000 1.26
+++ .cvsignore 5 Jul 2009 12:49:45 -0000 1.27
@@ -1 +1,2 @@
-cairo-dock-sources-svn1841_trunk.tar.bz2
+cairo-dock-2.0.7.tar.bz2
+cairo-dock-plugins-2.0.7.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cairo-dock.spec 2 Jul 2009 11:58:43 -0000 1.33
+++ cairo-dock.spec 5 Jul 2009 12:49:45 -0000 1.34
@@ -6,20 +6,20 @@
# cd trunk
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
-%global released 0
+%global released 1
%undefine pre_release
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.6
-%define betaver svn1841_trunk
+%global mainver 2.0.7
+%undefine betaver
%global build_themes 0
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -634,6 +634,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
+- 2.0.7
+
* Thu Jul 2 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- F-12: rebuild against new libxklavier
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 2 Jul 2009 11:58:43 -0000 1.28
+++ sources 5 Jul 2009 12:49:45 -0000 1.29
@@ -1 +1,2 @@
-1bd158afc6c53fdc4ee7524bd41c59a2 cairo-dock-sources-svn1841_trunk.tar.bz2
+856c7751a9af3bc58ee167dd9b7b5317 cairo-dock-2.0.7.tar.bz2
+e35eaebbaa22340479fad7952d16a14c cairo-dock-plugins-2.0.7.tar.bz2
15 years, 4 months
rpms/gmameui/devel .cvsignore, 1.2, 1.3 gmameui.spec, 1.2, 1.3 sources, 1.2, 1.3
by Matthias Saou
Author: thias
Update of /cvs/nonfree/rpms/gmameui/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8346
Modified Files:
.cvsignore gmameui.spec sources
Log Message:
Update to 0.2.10.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2008 13:53:11 -0000 1.2
+++ .cvsignore 5 Jul 2009 12:31:52 -0000 1.3
@@ -1 +1 @@
-gmameui-0.2.2.tar.gz
+gmameui-0.2.10.tar.gz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/gmameui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmameui.spec 29 Mar 2009 14:54:04 -0000 1.2
+++ gmameui.spec 5 Jul 2009 12:31:52 -0000 1.3
@@ -1,17 +1,20 @@
Summary: Frontend for MAME
Name: gmameui
-Version: 0.2.2
-Release: 3%{?dist}
+Version: 0.2.10
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
Source: http://downloads.sf.net/gmameui/gmameui-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gtk2-devel
+BuildRequires: libgnome-devel
BuildRequires: expat-devel
BuildRequires: libglade2-devel
BuildRequires: gettext, bison
-BuildRequires: perl(XML::Parser)
+BuildRequires: intltool, perl(XML::Parser)
+BuildRequires: libarchive-devel
+BuildRequires: gnome-doc-utils
%description
GMAMEUI is a front-end program that helps you run MAME (either xmame or
@@ -30,7 +33,7 @@
%install
%{__rm} -rf %{buildroot} _docs
%{__make} install DESTDIR=%{buildroot}
-#find_lang %{name}
+%find_lang %{name}
# Put the docs back into place
%{__mkdir} _docs
@@ -41,18 +44,24 @@
%{__rm} -rf %{buildroot}
-%files
-# -f %{name}.lang
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc _docs/*
%{_bindir}/gmameui
%{_datadir}/applications/gmameui.desktop
%{_datadir}/pixmaps/gmameui.png
%{_datadir}/gmameui/
+%{_datadir}/gnome/help/gmameui/
+%{_datadir}/omf/gmameui/
%{_mandir}/man6/gmameui.6*
%changelog
+* Sun Jul 5 2009 Matthias Saou <http://freshrpms.net/> 0.2.10-1
+- Update to 0.2.10.
+- Add new libgnome-devel and libarchive-devel build requirements.
+- Re-enable translations, they build/install again.
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.2.2-3
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2008 13:53:11 -0000 1.2
+++ sources 5 Jul 2009 12:31:52 -0000 1.3
@@ -1 +1 @@
-2da4f06c3ade3c4d6c1356465925816d gmameui-0.2.2.tar.gz
+3a198f6b066eb81b62ed72924447c46f gmameui-0.2.10.tar.gz
15 years, 4 months
rpms/transcode/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 transcode.spec, 1.15, 1.16
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31464
Modified Files:
.cvsignore sources transcode.spec
Log Message:
- Update to 1.1.2
- Fix rpmlint errors
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 22 Feb 2009 10:59:28 -0000 1.7
+++ .cvsignore 5 Jul 2009 10:07:11 -0000 1.8
@@ -1 +1 @@
-transcode-1.1.1.tar.bz2
+transcode-1.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 22 Feb 2009 10:59:28 -0000 1.7
+++ sources 5 Jul 2009 10:07:11 -0000 1.8
@@ -1 +1 @@
-46a3ccbcac2d34dd34814a09143e3f23 transcode-1.1.1.tar.bz2
+753f7ee4ae154aac1527ceda9d085e65 transcode-1.1.2.tar.bz2
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- transcode.spec 4 Jul 2009 21:59:16 -0000 1.15
+++ transcode.spec 5 Jul 2009 10:07:11 -0000 1.16
@@ -6,8 +6,8 @@
%define pvmdir %{_datadir}/pvm3
Name: transcode
-Version: 1.1.1
-Release: 6%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -16,7 +16,7 @@
Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
-Patch4: transcode-1.1.1-textrel.patch
+Patch4: transcode-1.1.1-textrel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,7 +82,7 @@
%configure \
--disable-dependency-tracking \
- --disable-x86-textrels \
+ --disable-x86-textrels \
--with-x \
--enable-libavcodec \
--enable-libavformat \
@@ -138,6 +138,10 @@
%changelog
+* Sun Jul 5 2009 David Juran <david(a)juran.se> - 1.1.2-1
+- Update to 1.1.2
+- Fix rpmlint errors
+
* Sat Jul 4 2009 David Juran <david(a)juran.se> - 1.1.1-6
- Fix TEXTREL (Bz 658)
- Update URL
15 years, 4 months
rpms/transcode/devel transcode-1.1.1-textrel.patch, NONE, 1.1 transcode.spec, 1.14, 1.15
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26482
Modified Files:
transcode.spec
Added Files:
transcode-1.1.1-textrel.patch
Log Message:
- Fix TEXTREL (Bz 658)
- Update URL
transcode-1.1.1-textrel.patch:
--- NEW FILE transcode-1.1.1-textrel.patch ---
# HG changeset patch
# User achurch
# Date 1243924499 -32400
# Node ID c243289ebe50bf95b0d69852f2a5d3c31f666dce
# Parent 852f3e9b61b2c692f9d715be8ff965d18110d1f5
Add --disable-x86-textrels configure option (default enabled) to fix bug #15302.
testsuite/test-acmemcpy confirmed to pass on x86 with both --disable- and
--enable-x86-textrels.
===========================================================================
--- a/aclib/memcpy.c Tue Jun 02 13:42:47 2009 +0900
+++ b/aclib/memcpy.c Tue Jun 02 15:34:59 2009 +0900
@@ -59,8 +59,15 @@
# First align destination address to a multiple of 8 bytes \n\
mov $8, %%eax # EAX <- (8-dest) & 7 \n\
sub %%edi, %%eax \n\
- and $7, %%eax # ... which is the number of bytes to copy\n\
- lea 0f, %%edx # Use a computed jump--faster than a loop\n\
+ and $7, %%eax # ... which is the number of bytes to copy\n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS // Because "lea 0f" requires a textrel
+" xchg %%eax, %%ecx \n\
+ mov %%ecx, %%edx \n\
+ repz movsb \n\
+ mov %%eax, %%ecx \n\
+ mov %%edx, %%eax \n"
+#else
+" lea 0f, %%edx # Use a computed jump--faster than a loop\n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-7 MOVSB's \n\
movsb \n\
@@ -69,8 +76,9 @@
movsb \n\
movsb \n\
movsb \n\
- movsb \n\
-0: sub %%eax, %%ecx # Update count \n\
+ movsb \n"
+#endif
+"0: sub %%eax, %%ecx # Update count \n\
\n\
# Now copy data in blocks \n\
0: mov %%ecx, %%edx # EDX <- ECX >> 6 (cache lines to copy) \n\
@@ -114,8 +122,13 @@
mmx.memcpy_last: \n\
# Copy last <64 bytes, using the computed jump trick \n\
mov %%ecx, %%eax # EAX <- ECX>>2 \n\
- shr $2, %%eax \n\
- lea 0f, %%edx \n\
+ shr $2, %%eax \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ repz movsd \n\
+ mov %%eax, %%ecx \n"
+#else
+" lea 0f, %%edx \n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-15 MOVSD's \n\
movsd \n\
@@ -132,15 +145,20 @@
movsd \n\
movsd \n\
movsd \n\
- movsd \n\
-0: and $3, %%ecx # ECX <- ECX & 3 \n\
- lea 0f, %%edx \n\
+ movsd \n"
+#endif
+"0: and $3, %%ecx # ECX <- ECX & 3 \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" repz movsb \n"
+#else
+" lea 0f, %%edx \n\
sub %%ecx, %%edx \n\
jmp *%%edx # Execute 0-3 MOVSB's \n\
movsb \n\
movsb \n\
- movsb \n\
-0: \n\
+ movsb \n"
+#endif
+"0: \n\
# All done! \n\
emms # Clean up MMX state \n\
pop %%edi # Restore destination (return value) \n\
@@ -180,8 +198,15 @@
# First align destination address to a multiple of 8 bytes \n\
mov $8, %%eax # EAX <- (8-dest) & 7 \n\
sub %%edi, %%eax \n\
- and $7, %%eax # ... which is the number of bytes to copy\n\
- lea 0f, %%edx # Use a computed jump--faster than a loop\n\
+ and $7, %%eax # ... which is the number of bytes to copy\n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ mov %%ecx, %%edx \n\
+ repz movsb \n\
+ mov %%eax, %%ecx \n\
+ mov %%edx, %%eax \n"
+#else
+" lea 0f, %%edx # Use a computed jump--faster than a loop\n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-7 MOVSB's \n\
movsb \n\
@@ -190,8 +215,9 @@
movsb \n\
movsb \n\
movsb \n\
- movsb \n\
-0: sub %%eax, %%ecx # Update count \n\
+ movsb \n"
+#endif
+"0: sub %%eax, %%ecx # Update count \n\
\n\
cmp $0x10040, %%ecx # Is this a large block? (0x10040 is an \n\
# arbitrary value where prefetching and \n\
@@ -266,8 +292,13 @@
sse.memcpy_last: \n\
# Copy last <64 bytes, using the computed jump trick \n\
mov %%ecx, %%eax # EAX <- ECX>>2 \n\
- shr $2, %%eax \n\
- lea 0f, %%edx \n\
+ shr $2, %%eax \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ repz movsd \n\
+ mov %%eax, %%ecx \n"
+#else
+" lea 0f, %%edx \n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-15 MOVSD's \n\
movsd \n\
@@ -284,15 +315,20 @@
movsd \n\
movsd \n\
movsd \n\
- movsd \n\
-0: and $3, %%ecx # ECX <- ECX & 3 \n\
- lea sse.memcpy_end, %%edx \n\
+ movsd \n"
+#endif
+"0: and $3, %%ecx # ECX <- ECX & 3 \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" repz movsb \n"
+#else
+" lea sse.memcpy_end, %%edx \n\
sub %%ecx, %%edx \n\
jmp *%%edx # Execute 0-3 MOVSB's \n\
movsb \n\
movsb \n\
- movsb \n\
- \n\
+ movsb \n"
+#endif
+" \n\
sse.memcpy_end: \n\
# All done! \n\
emms # Clean up after MMX instructions \n\
--- a/configure.in Tue Jun 02 13:42:47 2009 +0900
+++ b/configure.in Tue Jun 02 15:34:59 2009 +0900
@@ -1356,6 +1356,11 @@
dnl
dnl aclib
dnl
+AC_ARG_ENABLE([x86-textrels],
+ AC_HELP_STRING([--enable-x86-textrels], [enable x86-32 optimizations which use text relocations (yes)]),
+ [if test "no" = "$enableval"; then
+ AC_DEFINE([ACLIB_DISABLE_X86_TEXTRELS], [1], [Disable x86-32 optimizations in aclib that require text relocations])
+ fi])
ACLIB_LIBS="\$(top_builddir)/aclib/libac.la"
AC_SUBST(ACLIB_LIBS)
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- transcode.spec 29 Mar 2009 14:14:59 -0000 1.14
+++ transcode.spec 4 Jul 2009 21:59:16 -0000 1.15
@@ -7,15 +7,16 @@
Name: transcode
Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
-URL: http://www.transcoding.org/
-Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2
+URL: http://tcforge.berlios.de/
+Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
+Patch4: transcode-1.1.1-textrel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +68,7 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
+%patch4 -p1 -b .textrel
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
rm import/v4l/videodev2.h
@@ -80,6 +82,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-x86-textrels \
--with-x \
--enable-libavcodec \
--enable-libavformat \
@@ -135,6 +138,10 @@
%changelog
+* Sat Jul 4 2009 David Juran <david(a)juran.se> - 1.1.1-6
+- Fix TEXTREL (Bz 658)
+- Update URL
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1.1-5
- rebuild for new F11 features
15 years, 4 months
rpms/transcode/F-11 transcode-1.1.1-textrel.patch, NONE, 1.1 transcode.spec, 1.14, 1.15
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26044
Modified Files:
transcode.spec
Added Files:
transcode-1.1.1-textrel.patch
Log Message:
- Fix TEXTREL (Bz 658)
- Update URL
transcode-1.1.1-textrel.patch:
--- NEW FILE transcode-1.1.1-textrel.patch ---
# HG changeset patch
# User achurch
# Date 1243924499 -32400
# Node ID c243289ebe50bf95b0d69852f2a5d3c31f666dce
# Parent 852f3e9b61b2c692f9d715be8ff965d18110d1f5
Add --disable-x86-textrels configure option (default enabled) to fix bug #15302.
testsuite/test-acmemcpy confirmed to pass on x86 with both --disable- and
--enable-x86-textrels.
===========================================================================
--- a/aclib/memcpy.c Tue Jun 02 13:42:47 2009 +0900
+++ b/aclib/memcpy.c Tue Jun 02 15:34:59 2009 +0900
@@ -59,8 +59,15 @@
# First align destination address to a multiple of 8 bytes \n\
mov $8, %%eax # EAX <- (8-dest) & 7 \n\
sub %%edi, %%eax \n\
- and $7, %%eax # ... which is the number of bytes to copy\n\
- lea 0f, %%edx # Use a computed jump--faster than a loop\n\
+ and $7, %%eax # ... which is the number of bytes to copy\n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS // Because "lea 0f" requires a textrel
+" xchg %%eax, %%ecx \n\
+ mov %%ecx, %%edx \n\
+ repz movsb \n\
+ mov %%eax, %%ecx \n\
+ mov %%edx, %%eax \n"
+#else
+" lea 0f, %%edx # Use a computed jump--faster than a loop\n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-7 MOVSB's \n\
movsb \n\
@@ -69,8 +76,9 @@
movsb \n\
movsb \n\
movsb \n\
- movsb \n\
-0: sub %%eax, %%ecx # Update count \n\
+ movsb \n"
+#endif
+"0: sub %%eax, %%ecx # Update count \n\
\n\
# Now copy data in blocks \n\
0: mov %%ecx, %%edx # EDX <- ECX >> 6 (cache lines to copy) \n\
@@ -114,8 +122,13 @@
mmx.memcpy_last: \n\
# Copy last <64 bytes, using the computed jump trick \n\
mov %%ecx, %%eax # EAX <- ECX>>2 \n\
- shr $2, %%eax \n\
- lea 0f, %%edx \n\
+ shr $2, %%eax \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ repz movsd \n\
+ mov %%eax, %%ecx \n"
+#else
+" lea 0f, %%edx \n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-15 MOVSD's \n\
movsd \n\
@@ -132,15 +145,20 @@
movsd \n\
movsd \n\
movsd \n\
- movsd \n\
-0: and $3, %%ecx # ECX <- ECX & 3 \n\
- lea 0f, %%edx \n\
+ movsd \n"
+#endif
+"0: and $3, %%ecx # ECX <- ECX & 3 \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" repz movsb \n"
+#else
+" lea 0f, %%edx \n\
sub %%ecx, %%edx \n\
jmp *%%edx # Execute 0-3 MOVSB's \n\
movsb \n\
movsb \n\
- movsb \n\
-0: \n\
+ movsb \n"
+#endif
+"0: \n\
# All done! \n\
emms # Clean up MMX state \n\
pop %%edi # Restore destination (return value) \n\
@@ -180,8 +198,15 @@
# First align destination address to a multiple of 8 bytes \n\
mov $8, %%eax # EAX <- (8-dest) & 7 \n\
sub %%edi, %%eax \n\
- and $7, %%eax # ... which is the number of bytes to copy\n\
- lea 0f, %%edx # Use a computed jump--faster than a loop\n\
+ and $7, %%eax # ... which is the number of bytes to copy\n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ mov %%ecx, %%edx \n\
+ repz movsb \n\
+ mov %%eax, %%ecx \n\
+ mov %%edx, %%eax \n"
+#else
+" lea 0f, %%edx # Use a computed jump--faster than a loop\n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-7 MOVSB's \n\
movsb \n\
@@ -190,8 +215,9 @@
movsb \n\
movsb \n\
movsb \n\
- movsb \n\
-0: sub %%eax, %%ecx # Update count \n\
+ movsb \n"
+#endif
+"0: sub %%eax, %%ecx # Update count \n\
\n\
cmp $0x10040, %%ecx # Is this a large block? (0x10040 is an \n\
# arbitrary value where prefetching and \n\
@@ -266,8 +292,13 @@
sse.memcpy_last: \n\
# Copy last <64 bytes, using the computed jump trick \n\
mov %%ecx, %%eax # EAX <- ECX>>2 \n\
- shr $2, %%eax \n\
- lea 0f, %%edx \n\
+ shr $2, %%eax \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" xchg %%eax, %%ecx \n\
+ repz movsd \n\
+ mov %%eax, %%ecx \n"
+#else
+" lea 0f, %%edx \n\
sub %%eax, %%edx \n\
jmp *%%edx # Execute 0-15 MOVSD's \n\
movsd \n\
@@ -284,15 +315,20 @@
movsd \n\
movsd \n\
movsd \n\
- movsd \n\
-0: and $3, %%ecx # ECX <- ECX & 3 \n\
- lea sse.memcpy_end, %%edx \n\
+ movsd \n"
+#endif
+"0: and $3, %%ecx # ECX <- ECX & 3 \n"
+#ifdef ACLIB_DISABLE_X86_TEXTRELS
+" repz movsb \n"
+#else
+" lea sse.memcpy_end, %%edx \n\
sub %%ecx, %%edx \n\
jmp *%%edx # Execute 0-3 MOVSB's \n\
movsb \n\
movsb \n\
- movsb \n\
- \n\
+ movsb \n"
+#endif
+" \n\
sse.memcpy_end: \n\
# All done! \n\
emms # Clean up after MMX instructions \n\
--- a/configure.in Tue Jun 02 13:42:47 2009 +0900
+++ b/configure.in Tue Jun 02 15:34:59 2009 +0900
@@ -1356,6 +1356,11 @@
dnl
dnl aclib
dnl
+AC_ARG_ENABLE([x86-textrels],
+ AC_HELP_STRING([--enable-x86-textrels], [enable x86-32 optimizations which use text relocations (yes)]),
+ [if test "no" = "$enableval"; then
+ AC_DEFINE([ACLIB_DISABLE_X86_TEXTRELS], [1], [Disable x86-32 optimizations in aclib that require text relocations])
+ fi])
ACLIB_LIBS="\$(top_builddir)/aclib/libac.la"
AC_SUBST(ACLIB_LIBS)
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-11/transcode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- transcode.spec 29 Mar 2009 14:14:59 -0000 1.14
+++ transcode.spec 4 Jul 2009 21:55:10 -0000 1.15
@@ -7,15 +7,16 @@
Name: transcode
Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
-URL: http://www.transcoding.org/
-Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2
+URL: http://tcforge.berlios.de/
+Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
+Patch4: transcode-1.1.1-textrel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +68,7 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
+%patch4 -p1 -b .textrel
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
rm import/v4l/videodev2.h
@@ -80,6 +82,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-x86-textrels \
--with-x \
--enable-libavcodec \
--enable-libavformat \
@@ -135,6 +138,10 @@
%changelog
+* Sat Jul 4 2009 David Juran <david(a)juran.se> - 1.1.1-6
+- Fix TEXTREL (Bz 658)
+- Update URL
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1.1-5
- rebuild for new F11 features
15 years, 4 months
rpms/open-vm-tools-kmod/F-11 .cvsignore, 1.6, 1.7 open-vm-tools-kmod.spec, 1.31, 1.32 sources, 1.6, 1.7
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29258
Modified Files:
.cvsignore open-vm-tools-kmod.spec sources
Log Message:
- Update to upstream build 172495
- Some build changes to use new common code subdirectory
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 23 Mar 2009 11:06:37 -0000 1.6
+++ .cvsignore 4 Jul 2009 12:28:40 -0000 1.7
@@ -1 +1 @@
-open-vm-tools-2009.03.18-154848.tar.gz
+open-vm-tools-2009.06.18-172495.tar.gz
Index: open-vm-tools-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-11/open-vm-tools-kmod.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- open-vm-tools-kmod.spec 21 Jun 2009 08:53:33 -0000 1.31
+++ open-vm-tools-kmod.spec 4 Jul 2009 12:28:40 -0000 1.32
@@ -6,13 +6,13 @@
%define buildforkernels newest
%define tname open-vm-tools
-%define builddate 2009.03.18
-%define buildver 154848
+%define builddate 2009.06.18
+%define buildver 172495
%define ovtmodules vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock pvscsi
Name: open-vm-tools-kmod
Version: 0.0.0.%{buildver}
-Release: 1%{?dist}.10
+Release: 1%{?dist}
Summary: VMware Tools Kernel Modules
Group: System Environment/Kernel
License: GPLv2
@@ -45,14 +45,16 @@
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
for kernel_version in %{?kernel_versions} ; do
- cp -ar modules/linux _kmod_build_${kernel_version%%___*}
+ mkdir -p _kmod_build_${kernel_version%%___*}/
+ cp -ar modules _kmod_build_${kernel_version%%___*}/
+ cp -ar lib _kmod_build_${kernel_version%%___*}/
done
%build
for kernel_version in %{?kernel_versions} ; do
for ovtmodule in %{ovtmodules}; do
- make -C ${PWD}/_kmod_build_${kernel_version%%___*}/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" CC_OPTS=-DVMW_HAVE_EPOLL
+ make -C ${PWD}/_kmod_build_${kernel_version%%___*}/modules/linux/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" OVT_SOURCE_DIR=${PWD}/_kmod_build_${kernel_version%%___*} CC_OPTS=-DVMW_HAVE_EPOLL
done
done
@@ -61,7 +63,7 @@
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions} ; do
for ovtmodule in %{ovtmodules}; do
- install -D -m 755 _kmod_build_${kernel_version%%___*}/${ovtmodule}/${ovtmodule}.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/${ovtmodule}.ko
+ install -D -m 755 _kmod_build_${kernel_version%%___*}/modules/linux/${ovtmodule}/${ovtmodule}.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/${ovtmodule}.ko
done
done
# akmods:
@@ -73,6 +75,10 @@
%changelog
+* Sat Jul 4 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.172495-1
+- Update to upstream build 172495
+- Some build changes to use new common code subdirectory
+
* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.0.154848-1.10
- rebuild for new kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Mar 2009 11:06:37 -0000 1.6
+++ sources 4 Jul 2009 12:28:40 -0000 1.7
@@ -1 +1 @@
-23d577a1bc07fa61bcd5352e94f05ed6 open-vm-tools-2009.03.18-154848.tar.gz
+8bd5304e84465005bb01b5055497cce1 open-vm-tools-2009.06.18-172495.tar.gz
15 years, 4 months