rpms/openafs/F-19 .cvsignore, 1.18, 1.19 openafs.spec, 1.45, 1.46 sources, 1.22, 1.23
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23548
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/openafs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- openafs.spec 19 Jul 2014 13:27:41 -0000 1.45
+++ openafs.spec 23 Sep 2014 22:06:38 -0000 1.46
@@ -10,7 +10,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
# Use systemd unit files on RHEL 7 and above.
@@ -21,7 +21,7 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.8
+Version: 1.6.10
Release: %{?pre:0.}1%{?pre}%{?dist}
License: IBM
Group: System Environment/Daemons
@@ -442,6 +442,7 @@
%{_sbindir}/vldb_convert
%{_sbindir}/voldump
%{_sbindir}/volinfo
+%{_sbindir}/volscan
%{_sbindir}/bos_util
%{_sbindir}/kadb_check
%{_sbindir}/ka-forwarder
@@ -465,6 +466,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
+
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
- Fix systemd conditional
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 19 Jul 2014 13:27:41 -0000 1.22
+++ sources 23 Sep 2014 22:06:38 -0000 1.23
@@ -1,2 +1,2 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
-286cd53aa3e8e5d38baf4f75a95d4162 openafs-1.6.8pre2-doc.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
+4fe62dcc107eb09b423e8cd09e2532cc openafs-1.6.10pre1-doc.tar.bz2
10 years, 2 months
rpms/openafs-kmod/F-19 .cvsignore, 1.19, 1.20 openafs-kmod.spec, 1.96, 1.97 sources, 1.22, 1.23
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23514
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 19 Jul 2014 13:25:38 -0000 1.19
+++ .cvsignore 23 Sep 2014 22:06:32 -0000 1.20
@@ -1 +1 @@
-openafs-1.6.8pre2-src.tar.bz2
+openafs-1.6.10pre1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/openafs-kmod.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- openafs-kmod.spec 19 Sep 2014 11:07:00 -0000 1.96
+++ openafs-kmod.spec 23 Sep 2014 22:06:32 -0000 1.97
@@ -1,5 +1,5 @@
# (un)define the next line to either build for the newest or all current kernels
-%global buildforkernels newest
+#global buildforkernels newest
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -15,7 +15,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
%define kmod_name openafs
@@ -23,8 +23,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.8
-Release: %{?pre:0.}1%{?pre}%{?dist}.16
+Version: 1.6.10
+Release: %{?pre:0.}1%{?pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -104,53 +104,8 @@
%changelog
-* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.16
-- Rebuilt for kernel
-
-* Wed Sep 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.15
-- Rebuilt for kernel
-
-* Fri Aug 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.14
-- Rebuilt for kernel
-
-* Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.13
-- Rebuilt for kernel
-
-* Sat Aug 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.12
-- Rebuilt for kernel
-
-* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.11
-- Rebuilt for kernel
-
-* Thu Jul 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.10
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.9
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.8
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.7
-- Rebuilt for kernel
-
-* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.6
-- Rebuilt for kernel
-
-* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.5
-- Rebuilt for kernel
-
-* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.4
-- Rebuilt for kernel
-
-* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.3
-- Rebuilt for kernel
-
-* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.2
-- Rebuilt for kernel
-
-* Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.1
-- Rebuilt for kernel
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 19 Jul 2014 13:25:38 -0000 1.22
+++ sources 23 Sep 2014 22:06:32 -0000 1.23
@@ -1 +1 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
10 years, 2 months
rpms/openafs/F-20 .cvsignore, 1.19, 1.20 openafs.spec, 1.47, 1.48 sources, 1.23, 1.24
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23006
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-20/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 30 Apr 2014 16:59:27 -0000 1.19
+++ .cvsignore 23 Sep 2014 21:54:19 -0000 1.20
@@ -1,2 +1,2 @@
-openafs-1.6.8pre2-src.tar.bz2
-openafs-1.6.8pre2-doc.tar.bz2
+openafs-1.6.10pre1-src.tar.bz2
+openafs-1.6.10pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-20/openafs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- openafs.spec 30 Apr 2014 16:59:27 -0000 1.47
+++ openafs.spec 23 Sep 2014 21:54:19 -0000 1.48
@@ -10,7 +10,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
# Use systemd unit files on RHEL 7 and above.
@@ -21,7 +21,7 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.8
+Version: 1.6.10
Release: %{?pre:0.}1%{?pre}%{?dist}
License: IBM
Group: System Environment/Daemons
@@ -442,6 +442,7 @@
%{_sbindir}/vldb_convert
%{_sbindir}/voldump
%{_sbindir}/volinfo
+%{_sbindir}/volscan
%{_sbindir}/bos_util
%{_sbindir}/kadb_check
%{_sbindir}/ka-forwarder
@@ -465,6 +466,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
+
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
- Fix systemd conditional
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-20/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 30 Apr 2014 16:59:27 -0000 1.23
+++ sources 23 Sep 2014 21:54:19 -0000 1.24
@@ -1,2 +1,2 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
-286cd53aa3e8e5d38baf4f75a95d4162 openafs-1.6.8pre2-doc.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
+4fe62dcc107eb09b423e8cd09e2532cc openafs-1.6.10pre1-doc.tar.bz2
10 years, 2 months
rpms/openafs-kmod/F-20 .cvsignore, 1.20, 1.21 openafs-kmod.spec, 1.86, 1.87 sources, 1.23, 1.24
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22867
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-20/openafs-kmod.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- openafs-kmod.spec 19 Sep 2014 11:05:53 -0000 1.86
+++ openafs-kmod.spec 23 Sep 2014 21:53:28 -0000 1.87
@@ -1,5 +1,5 @@
# (un)define the next line to either build for the newest or all current kernels
-%global buildforkernels newest
+#global buildforkernels newest
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -15,7 +15,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
%define kmod_name openafs
@@ -23,8 +23,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.8
-Release: %{?pre:0.}1%{?pre}%{?dist}.21
+Version: 1.6.10
+Release: %{?pre:0.}1%{?pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -104,68 +104,8 @@
%changelog
-* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.21
-- Rebuilt for kernel
-
-* Thu Sep 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.20
-- Rebuilt for kernel
-
-* Tue Sep 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.19
-- Rebuilt for kernel
-
-* Sat Aug 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.18
-- Rebuilt for kernel
-
-* Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.17
-- Rebuilt for kernel
-
-* Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.16
-- Rebuilt for kernel
-
-* Fri Aug 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.15
-- Rebuilt for kernel
-
-* Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.14
-- Rebuilt for kernel
-
-* Sat Aug 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.13
-- Rebuilt for kernel
-
-* Fri Aug 01 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.12
-- Rebuilt for kernel
-
-* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.11
-- Rebuilt for kernel
-
-* Thu Jul 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.10
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.9
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.8
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.7
-- Rebuilt for kernel
-
-* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.6
-- Rebuilt for kernel
-
-* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.5
-- Rebuilt for kernel
-
-* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.4
-- Rebuilt for kernel
-
-* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.3
-- Rebuilt for kernel
-
-* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.2
-- Rebuilt for kernel
-
-* Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.8-0.1pre2.1
-- Rebuilt for kernel
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-20/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 30 Apr 2014 17:00:06 -0000 1.23
+++ sources 23 Sep 2014 21:53:28 -0000 1.24
@@ -1 +1 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
10 years, 2 months
rpms/openafs-kmod/devel .cvsignore, 1.21, 1.22 openafs-kmod.spec, 1.42, 1.43 sources, 1.24, 1.25
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22316
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 30 Apr 2014 16:57:54 -0000 1.21
+++ .cvsignore 23 Sep 2014 21:43:19 -0000 1.22
@@ -1 +1 @@
-openafs-1.6.8pre2-src.tar.bz2
+openafs-1.6.10pre1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openafs-kmod.spec 30 Apr 2014 16:57:54 -0000 1.42
+++ openafs-kmod.spec 23 Sep 2014 21:43:19 -0000 1.43
@@ -15,7 +15,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
%define kmod_name openafs
@@ -23,7 +23,7 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.8
+Version: 1.6.10
Release: %{?pre:0.}1%{?pre}%{?dist}
Summary: Kernel module(s)
@@ -104,6 +104,9 @@
%changelog
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
+
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 30 Apr 2014 16:57:54 -0000 1.24
+++ sources 23 Sep 2014 21:43:19 -0000 1.25
@@ -1 +1 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
10 years, 2 months
rpms/openafs/devel .cvsignore, 1.20, 1.21 openafs.spec, 1.48, 1.49 sources, 1.24, 1.25
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22278
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
- Update to OpenAFS 1.6.10pre1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 30 Apr 2014 16:57:11 -0000 1.20
+++ .cvsignore 23 Sep 2014 21:43:12 -0000 1.21
@@ -1,2 +1,2 @@
-openafs-1.6.8pre2-src.tar.bz2
-openafs-1.6.8pre2-doc.tar.bz2
+openafs-1.6.10pre1-src.tar.bz2
+openafs-1.6.10pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- openafs.spec 30 Apr 2014 16:57:11 -0000 1.48
+++ openafs.spec 23 Sep 2014 21:43:12 -0000 1.49
@@ -10,7 +10,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre1
#define pre %nil
# Use systemd unit files on RHEL 7 and above.
@@ -21,7 +21,7 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.8
+Version: 1.6.10
Release: %{?pre:0.}1%{?pre}%{?dist}
License: IBM
Group: System Environment/Daemons
@@ -442,6 +442,7 @@
%{_sbindir}/vldb_convert
%{_sbindir}/voldump
%{_sbindir}/volinfo
+%{_sbindir}/volscan
%{_sbindir}/bos_util
%{_sbindir}/kadb_check
%{_sbindir}/ka-forwarder
@@ -465,6 +466,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Tue Sep 23 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.10-0.1pre1
+- Update to OpenAFS 1.6.10pre1
+
* Wed Apr 30 2014 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.8-0.1pre2
- Update to OpenAFS 1.6.8pre2
- Fix systemd conditional
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 30 Apr 2014 16:57:11 -0000 1.24
+++ sources 23 Sep 2014 21:43:12 -0000 1.25
@@ -1,2 +1,2 @@
-32308737a45482a2d62fc0d18ab35c80 openafs-1.6.8pre2-src.tar.bz2
-286cd53aa3e8e5d38baf4f75a95d4162 openafs-1.6.8pre2-doc.tar.bz2
+619b5f0582a7769c6b12bdf438d5d584 openafs-1.6.10pre1-src.tar.bz2
+4fe62dcc107eb09b423e8cd09e2532cc openafs-1.6.10pre1-doc.tar.bz2
10 years, 2 months
rpms/libmpeg3/F-20 20140922_git47a2f45.patch, NONE, 1.1 libmpeg3.spec, 1.7, 1.8 20140830_git6c02a5e.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13305
Modified Files:
libmpeg3.spec
Added Files:
20140922_git47a2f45.patch
Removed Files:
20140830_git6c02a5e.patch
Log Message:
* Mon Sep 22 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-7
- Use 20140922_git47a2f45.patch, repo sergiomb2/libmpeg3 has been refactored,
almost just update git hash
20140922_git47a2f45.patch:
a52dec-0.7.3/AUTHORS | 20
a52dec-0.7.3/COPYING | 340 -
a52dec-0.7.3/ChangeLog | 92
a52dec-0.7.3/HISTORY | 22
a52dec-0.7.3/INSTALL | 5
a52dec-0.7.3/Makefile | 361 -
a52dec-0.7.3/Makefile.am | 3
a52dec-0.7.3/Makefile.in | 361 -
a52dec-0.7.3/NEWS | 37
a52dec-0.7.3/README | 177
a52dec-0.7.3/TODO | 10
a52dec-0.7.3/acinclude.m4 | 69
a52dec-0.7.3/aclocal.m4 | 3725 ------------
a52dec-0.7.3/bootstrap | 8
a52dec-0.7.3/config.log | 557 -
a52dec-0.7.3/config.status | 699 --
a52dec-0.7.3/configure | 9826 --------------------------------
a52dec-0.7.3/configure.in | 114
a52dec-0.7.3/include/Makefile | 263
a52dec-0.7.3/include/Makefile.am | 3
a52dec-0.7.3/include/Makefile.in | 263
a52dec-0.7.3/include/a52.h | 63
a52dec-0.7.3/include/attributes.h | 29
a52dec-0.7.3/include/audio_out.h | 64
a52dec-0.7.3/include/config.h | 97
a52dec-0.7.3/include/config.h.in | 96
a52dec-0.7.3/include/mm_accel.h | 37
a52dec-0.7.3/include/stamp-h | 1
a52dec-0.7.3/include/stamp-h.in | 1
a52dec-0.7.3/include/tendra.h | 35
a52dec-0.7.3/liba52/Makefile | 332 -
a52dec-0.7.3/liba52/Makefile.am | 9
a52dec-0.7.3/liba52/Makefile.in | 332 -
a52dec-0.7.3/liba52/a52_internal.h | 115
a52dec-0.7.3/liba52/bit_allocate.c | 265
a52dec-0.7.3/liba52/bitstream.c | 103
a52dec-0.7.3/liba52/bitstream.h | 82
a52dec-0.7.3/liba52/configure.incl | 19
a52dec-0.7.3/liba52/downmix.c | 655 --
a52dec-0.7.3/liba52/imdct.c | 448 -
a52dec-0.7.3/liba52/parse.c | 900 --
a52dec-0.7.3/liba52/tables.h | 246
a52dec-0.7.3/libao/Makefile | 321 -
a52dec-0.7.3/libao/Makefile.am | 6
a52dec-0.7.3/libao/Makefile.in | 321 -
a52dec-0.7.3/libao/audio_out.c | 82
a52dec-0.7.3/libao/audio_out_aif.c | 151
a52dec-0.7.3/libao/audio_out_float.c | 68
a52dec-0.7.3/libao/audio_out_internal.h | 37
a52dec-0.7.3/libao/audio_out_null.c | 78
a52dec-0.7.3/libao/audio_out_oss.c | 194
a52dec-0.7.3/libao/audio_out_solaris.c | 166
a52dec-0.7.3/libao/audio_out_wav.c | 145
a52dec-0.7.3/libao/configure.incl | 34
a52dec-0.7.3/libao/float2s16.c | 178
a52dec-0.7.3/libtool | 5315 -----------------
a52dec-0.7.3/src/Makefile | 381 -
a52dec-0.7.3/src/Makefile.am | 11
a52dec-0.7.3/src/Makefile.in | 381 -
a52dec-0.7.3/src/a52dec.1 | 43
a52dec-0.7.3/src/a52dec.c | 589 -
a52dec-0.7.3/src/configure.incl | 7
a52dec-0.7.3/src/extract_a52.1 | 32
a52dec-0.7.3/src/extract_a52.c | 354 -
a52dec-0.7.3/src/getopt.c | 1055 ---
a52dec-0.7.3/src/getopt.h | 169
a52dec-0.7.3/test/Makefile | 331 -
a52dec-0.7.3/test/Makefile.am | 6
a52dec-0.7.3/test/Makefile.in | 331 -
a52dec-0.7.3/test/compare.c | 79
a52dec-0.7.3/test/compile | 46
a52dec-0.7.3/test/globals | 24
a52dec-0.7.3/test/regression | 48
a52dec-0.7.3/test/tests | 10
a52dec-0.7.3/vc++/Makefile | 182
a52dec-0.7.3/vc++/Makefile.am | 1
a52dec-0.7.3/vc++/Makefile.in | 182
a52dec-0.7.3/vc++/a52dec.dsp | 108
a52dec-0.7.3/vc++/a52dec.dsw | 59
a52dec-0.7.3/vc++/config.h | 96
a52dec-0.7.3/vc++/inttypes.h | 13
a52dec-0.7.3/vc++/liba52.dsp | 128
a52dec-0.7.3/vc++/libao.dsp | 128
b/COPYING | 66
b/Makefile.am | 61
b/audio/Makefile.am | 12
b/audio/ac3.c | 2
b/bootstrap | 7
b/configure.ac | 124
b/libmpeg3.c | 1
b/libmpeg3.h | 1
b/libmpeg3.pc.in | 12
b/libmpeg3.spec.in | 160
b/mpeg2qt.c | 5
b/mpeg3protos.h | 2
b/mpeg3toc.c | 2
b/mpeg3tocutil.c | 4
b/video/Makefile.am | 29
b/video/mmxidct.S | 4
b/video/output.c | 2
b/video/reconmmx.s | 4
b/video/vlc.c | 3
depend.a52 | 27
103 files changed, 450 insertions(+), 32852 deletions(-)
--- NEW FILE 20140922_git47a2f45.patch ---
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
index 1ad9cd3..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -56,18 +56,18 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The \"Program\", below,
-refers to any such program or work, and a \"work based on the Program\"
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
-the term \"modification\".) Each licensee is addressed as \"you\".
+the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -240,8 +240,8 @@ be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and \"any
-later version\", you have the option of following the terms and conditions
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
@@ -255,12 +255,12 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
@@ -277,26 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -305,10 +288,10 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
-the \"copyright\" line and a pointer to where the full notice is found.
+the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -320,17 +303,16 @@ the \"copyright\" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -341,7 +323,7 @@ be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a \"copyright disclaimer\" for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
@@ -353,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..c6d49b1
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,61 @@
+lib_LTLIBRARIES = libmpeg3.la
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@
+libmpeg3_la_LIBADD = @A52DEC_LIBS@ video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \
+ -lpthread
+libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \
+ mpeg3demux.c \
+ mpeg3ifo.c \
+ mpeg3io.c \
+ mpeg3strack.c \
+ mpeg3title.c \
+ mpeg3tocutil.c \
+ mpeg3vtrack.c \
+ workarounds.c
+
+bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat
+mpeg3dump_SOURCES = mpeg3dump.c
+mpeg3dump_LDADD = libmpeg3.la
+mpeg3dump_CFLAGS = $(AM_CFLAGS)
+mpeg3peek_SOURCES = mpeg3peek.c
+mpeg3peek_LDADD = libmpeg3.la
+mpeg3peek_CFLAGS = $(AM_CFLAGS)
+mpeg3toc_SOURCES = mpeg3toc.c
+mpeg3toc_LDADD = libmpeg3.la
[...33691 lines suppressed...]
+* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2
+- Run make twice since there is an EOF error that makes the first run abort.
+
+* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1
+- Update to 1.7.
+
+* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2
+- Add -fPIC to the CFLAGS to fix transcode build on x86_64.
+
+* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1
+- Update to 1.6.
+- Split "main" into "utils" (bin) and "devel" (the static lib).
+- Add Makefile patch to ease install and get our CFLAGS used.
+- Don't enable MMX on x86_64, the x86 asm fails.
+
+* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5
+- Force __USE_LARGEFILE64 to fix FC4 ppc build.
+
+* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4
+- Add gcc4 patch.
+
+* Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3
+- Remove unneeded /usr/bin fix, since we don't use "make install".
+- Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4.
+- Make nasm mandatory : The configure script won't run without it anyway.
+- Use libdir/*.* in order to not catch all debuginfo files too.
+- Added -devel provides for now.
+
+* Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2
+- Fixes for x86_64.
+
+* Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1
+- Updated to release 1.5.4.
+
+* Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0
+- Updated to release 1.5.2.
+
+* Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0
+- Initial package. (using DAR)
diff --git a/mpeg2qt.c b/mpeg2qt.c
index 141237e..f2f1afc 100644
--- a/mpeg2qt.c
+++ b/mpeg2qt.c
@@ -71,6 +71,7 @@ void* trap_interrupt()
int main(int argc, char *argv[])
{
+ int error = 0;
int frame_count = -1;
char *row_pointers[3];
int do_audio = 0;
@@ -124,7 +125,7 @@ int main(int argc, char *argv[])
}
//printf("main 1\n");
- if(!(input = mpeg3_open(input_path)))
+ if(!(input = mpeg3_open(input_path, &error)))
{
exit(1);
}
@@ -180,7 +181,7 @@ int main(int argc, char *argv[])
//printf("main 1\n");
// quicktime_set_jpeg(output, 100, 0);
- mpeg3_set_mmx(input, 0);
+// mpeg3_set_mmx(input, 0);
while((!(do_video && mpeg3_end_of_video(input, layer)) ||
!(do_audio && mpeg3_end_of_audio(input, astream))) &&
diff --git a/mpeg3protos.h b/mpeg3protos.h
index c79a11b..6dec578 100644
--- a/mpeg3protos.h
+++ b/mpeg3protos.h
@@ -391,7 +391,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_t *demuxer, int title_number);
/* Go to the absolute byte given */
int mpeg3demux_seek_byte(mpeg3_demuxer_t *demuxer, int64_t byte);
-/* Seek to the title and cell containing the absolute byte of the
+/* Seek to the title and cell containing the absolute byte of the */
/* demuxer. */
/* Called at the beginning of every packet. */
int mpeg3_seek_phys(mpeg3_demuxer_t *demuxer);
diff --git a/mpeg3toc.c b/mpeg3toc.c
index f7c5284..50b201c 100644
--- a/mpeg3toc.c
+++ b/mpeg3toc.c
@@ -574,7 +574,7 @@ mpeg3demux_movie_size(input->atrack[j]->demuxer));
if(j == vtracks - 1 && l == frame_count - 1)
{
total_frames += frame_count;
- fprintf(stderr, "Video: title=%lld total_frames=%d ", title_number, total_frames);
+ fprintf(stderr, "Video: title=%lld total_frames=%d (%.1f \%)", title_number, total_frames,100*((float)position)/((float) mpeg3demux_movie_size(demuxer)));
}
}
}
diff --git a/mpeg3tocutil.c b/mpeg3tocutil.c
index 7afee58..540567f 100644
--- a/mpeg3tocutil.c
+++ b/mpeg3tocutil.c
@@ -1278,7 +1278,7 @@ void mpeg3_stop_toc(mpeg3_t *file)
// Store file information
PUT_INT32(FILE_INFO);
- fprintf(file->toc_fd, file->fs->path);
+ fprintf(file->toc_fd, "%s", file->fs->path);
for(j = strlen(file->fs->path); j < MPEG3_STRLEN; j++)
fputc(0, file->toc_fd);
PUT_INT64(file->source_date);
@@ -1309,7 +1309,7 @@ void mpeg3_stop_toc(mpeg3_t *file)
// Path
PUT_INT32(TITLE_PATH);
- fprintf(file->toc_fd, title->fs->path);
+ fprintf(file->toc_fd, "%s", title->fs->path);
// Pad path with 0
for(j = strlen(title->fs->path); j < MPEG3_STRLEN; j++)
diff --git a/video/Makefile.am b/video/Makefile.am
new file mode 100644
index 0000000..cba6ff5
--- /dev/null
+++ b/video/Makefile.am
@@ -0,0 +1,29 @@
+noinst_LTLIBRARIES = libmpeg3_video.la
+libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c motion.c \
+ mpeg3cache.c \
+ mpeg3video.c \
+ output.c \
+ reconstruct.c \
+ seek.c \
+ slice.c \
+ subtitle.c \
+ vlc.c
+
+if USEMMX
+libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
+else
+libmpeg3_video_la_SOURCES +=
+endif
+
+noinst_HEADERS = idct.h \
+ layerdata.h \
+ mpeg3video.h \
+ mpeg3videoprotos.h \
+ slice.h \
+ vlc.h
+
+libmpeg3_video_la_LDFLAGS=
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+INCLUDES=-I$(srcdir)/..
+
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
diff --git a/video/mmxidct.S b/video/mmxidct.S
index 9c3bebe..e40e7c9 100644
--- a/video/mmxidct.S
+++ b/video/mmxidct.S
@@ -673,3 +673,7 @@ IDCT_mmx:
ret
.Lfe1:
.size IDCT_mmx,.Lfe1-IDCT_mmx
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/video/output.c b/video/output.c
index 5c6f8fb..1c37d07 100644
--- a/video/output.c
+++ b/video/output.c
@@ -104,7 +104,7 @@ static unsigned char mpeg3_601_to_rgb[256];
*data++ = 0;
#define STORE_PIXEL_RGB565 \
- *((unsigned short*)data) = \
+ *(*(unsigned short**)(&data))++ = \
((CLIP(r_l) & 0xf8) << 8) | \
((CLIP(g_l) & 0xfc) << 3) | \
((CLIP(b_l) & 0xf8) >> 3); \
diff --git a/video/reconmmx.s b/video/reconmmx.s
index 1bb98ef..d9531cd 100644
--- a/video/reconmmx.s
+++ b/video/reconmmx.s
@@ -298,4 +298,6 @@ set_block_mmx:
pop esi
ret
-
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff --git a/video/vlc.c b/video/vlc.c
index 6ba853d..c20b2a8 100644
--- a/video/vlc.c
+++ b/video/vlc.c
@@ -1,3 +1,6 @@
+// FIXME: vlc.h redefines ERROR to 99 if and only if error is defined.
+#define ERROR
+
#include "mpeg3private.h"
#include "mpeg3protos.h"
#include "vlc.h"
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/F-20/libmpeg3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmpeg3.spec 30 Aug 2014 20:57:52 -0000 1.7
+++ libmpeg3.spec 22 Sep 2014 03:51:21 -0000 1.8
@@ -1,7 +1,7 @@
Summary: Decoder of various derivatives of MPEG standards
Name: libmpeg3
Version: 1.8
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://heroinewarrior.com/libmpeg3.php3
@@ -12,7 +12,7 @@
# git clone git@github.com:sergiomb2/libmpeg3.git
# tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
# git diff 1.8 . > "$date"_git"$tag".patch
-Patch0: 20140830_git6c02a5e.patch
+Patch0: 20140922_git47a2f45.patch
#BuildRequires: nasm
BuildRequires: a52dec-devel
@@ -123,6 +123,10 @@
%changelog
+* Mon Sep 22 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-7
+- Use 20140922_git47a2f45.patch, repo sergiomb2/libmpeg3 has been refactored,
+ almost just update git hash
+
* Tue Aug 26 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-6
- update to 20140830_git6c02a5e.patch (fixes when uses -Werror=format-security)
- add mpeg3protos.h to pkginclude_HEADERS
--- 20140830_git6c02a5e.patch DELETED ---
10 years, 2 months
rpms/libmpeg3/devel 20140830_git6c02a5e.patch,1.1,NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13143
Removed Files:
20140830_git6c02a5e.patch
Log Message:
Removed Files: 20140830_git6c02a5e.patch
--- 20140830_git6c02a5e.patch DELETED ---
10 years, 2 months
rpms/libmpeg3/devel 20140922_git47a2f45.patch, NONE, 1.1 libmpeg3.spec, 1.10, 1.11
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13005
Modified Files:
libmpeg3.spec
Added Files:
20140922_git47a2f45.patch
Log Message:
* Mon Sep 22 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-7
- Use 20140922_git47a2f45.patch, repo sergiomb2/libmpeg3 has been refactored,
almost just update git hash
20140922_git47a2f45.patch:
a52dec-0.7.3/AUTHORS | 20
a52dec-0.7.3/COPYING | 340 -
a52dec-0.7.3/ChangeLog | 92
a52dec-0.7.3/HISTORY | 22
a52dec-0.7.3/INSTALL | 5
a52dec-0.7.3/Makefile | 361 -
a52dec-0.7.3/Makefile.am | 3
a52dec-0.7.3/Makefile.in | 361 -
a52dec-0.7.3/NEWS | 37
a52dec-0.7.3/README | 177
a52dec-0.7.3/TODO | 10
a52dec-0.7.3/acinclude.m4 | 69
a52dec-0.7.3/aclocal.m4 | 3725 ------------
a52dec-0.7.3/bootstrap | 8
a52dec-0.7.3/config.log | 557 -
a52dec-0.7.3/config.status | 699 --
a52dec-0.7.3/configure | 9826 --------------------------------
a52dec-0.7.3/configure.in | 114
a52dec-0.7.3/include/Makefile | 263
a52dec-0.7.3/include/Makefile.am | 3
a52dec-0.7.3/include/Makefile.in | 263
a52dec-0.7.3/include/a52.h | 63
a52dec-0.7.3/include/attributes.h | 29
a52dec-0.7.3/include/audio_out.h | 64
a52dec-0.7.3/include/config.h | 97
a52dec-0.7.3/include/config.h.in | 96
a52dec-0.7.3/include/mm_accel.h | 37
a52dec-0.7.3/include/stamp-h | 1
a52dec-0.7.3/include/stamp-h.in | 1
a52dec-0.7.3/include/tendra.h | 35
a52dec-0.7.3/liba52/Makefile | 332 -
a52dec-0.7.3/liba52/Makefile.am | 9
a52dec-0.7.3/liba52/Makefile.in | 332 -
a52dec-0.7.3/liba52/a52_internal.h | 115
a52dec-0.7.3/liba52/bit_allocate.c | 265
a52dec-0.7.3/liba52/bitstream.c | 103
a52dec-0.7.3/liba52/bitstream.h | 82
a52dec-0.7.3/liba52/configure.incl | 19
a52dec-0.7.3/liba52/downmix.c | 655 --
a52dec-0.7.3/liba52/imdct.c | 448 -
a52dec-0.7.3/liba52/parse.c | 900 --
a52dec-0.7.3/liba52/tables.h | 246
a52dec-0.7.3/libao/Makefile | 321 -
a52dec-0.7.3/libao/Makefile.am | 6
a52dec-0.7.3/libao/Makefile.in | 321 -
a52dec-0.7.3/libao/audio_out.c | 82
a52dec-0.7.3/libao/audio_out_aif.c | 151
a52dec-0.7.3/libao/audio_out_float.c | 68
a52dec-0.7.3/libao/audio_out_internal.h | 37
a52dec-0.7.3/libao/audio_out_null.c | 78
a52dec-0.7.3/libao/audio_out_oss.c | 194
a52dec-0.7.3/libao/audio_out_solaris.c | 166
a52dec-0.7.3/libao/audio_out_wav.c | 145
a52dec-0.7.3/libao/configure.incl | 34
a52dec-0.7.3/libao/float2s16.c | 178
a52dec-0.7.3/libtool | 5315 -----------------
a52dec-0.7.3/src/Makefile | 381 -
a52dec-0.7.3/src/Makefile.am | 11
a52dec-0.7.3/src/Makefile.in | 381 -
a52dec-0.7.3/src/a52dec.1 | 43
a52dec-0.7.3/src/a52dec.c | 589 -
a52dec-0.7.3/src/configure.incl | 7
a52dec-0.7.3/src/extract_a52.1 | 32
a52dec-0.7.3/src/extract_a52.c | 354 -
a52dec-0.7.3/src/getopt.c | 1055 ---
a52dec-0.7.3/src/getopt.h | 169
a52dec-0.7.3/test/Makefile | 331 -
a52dec-0.7.3/test/Makefile.am | 6
a52dec-0.7.3/test/Makefile.in | 331 -
a52dec-0.7.3/test/compare.c | 79
a52dec-0.7.3/test/compile | 46
a52dec-0.7.3/test/globals | 24
a52dec-0.7.3/test/regression | 48
a52dec-0.7.3/test/tests | 10
a52dec-0.7.3/vc++/Makefile | 182
a52dec-0.7.3/vc++/Makefile.am | 1
a52dec-0.7.3/vc++/Makefile.in | 182
a52dec-0.7.3/vc++/a52dec.dsp | 108
a52dec-0.7.3/vc++/a52dec.dsw | 59
a52dec-0.7.3/vc++/config.h | 96
a52dec-0.7.3/vc++/inttypes.h | 13
a52dec-0.7.3/vc++/liba52.dsp | 128
a52dec-0.7.3/vc++/libao.dsp | 128
b/COPYING | 66
b/Makefile.am | 61
b/audio/Makefile.am | 12
b/audio/ac3.c | 2
b/bootstrap | 7
b/configure.ac | 124
b/libmpeg3.c | 1
b/libmpeg3.h | 1
b/libmpeg3.pc.in | 12
b/libmpeg3.spec.in | 160
b/mpeg2qt.c | 5
b/mpeg3protos.h | 2
b/mpeg3toc.c | 2
b/mpeg3tocutil.c | 4
b/video/Makefile.am | 29
b/video/mmxidct.S | 4
b/video/output.c | 2
b/video/reconmmx.s | 4
b/video/vlc.c | 3
depend.a52 | 27
103 files changed, 450 insertions(+), 32852 deletions(-)
--- NEW FILE 20140922_git47a2f45.patch ---
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
index 1ad9cd3..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -56,18 +56,18 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The \"Program\", below,
-refers to any such program or work, and a \"work based on the Program\"
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
-the term \"modification\".) Each licensee is addressed as \"you\".
+the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -240,8 +240,8 @@ be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and \"any
-later version\", you have the option of following the terms and conditions
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
@@ -255,12 +255,12 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
@@ -277,26 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -305,10 +288,10 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
-the \"copyright\" line and a pointer to where the full notice is found.
+the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -320,17 +303,16 @@ the \"copyright\" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -341,7 +323,7 @@ be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a \"copyright disclaimer\" for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
@@ -353,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..c6d49b1
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,61 @@
+lib_LTLIBRARIES = libmpeg3.la
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@
+libmpeg3_la_LIBADD = @A52DEC_LIBS@ video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \
+ -lpthread
+libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \
+ mpeg3demux.c \
+ mpeg3ifo.c \
+ mpeg3io.c \
+ mpeg3strack.c \
+ mpeg3title.c \
+ mpeg3tocutil.c \
+ mpeg3vtrack.c \
+ workarounds.c
+
+bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat
+mpeg3dump_SOURCES = mpeg3dump.c
+mpeg3dump_LDADD = libmpeg3.la
+mpeg3dump_CFLAGS = $(AM_CFLAGS)
+mpeg3peek_SOURCES = mpeg3peek.c
+mpeg3peek_LDADD = libmpeg3.la
+mpeg3peek_CFLAGS = $(AM_CFLAGS)
+mpeg3toc_SOURCES = mpeg3toc.c
+mpeg3toc_LDADD = libmpeg3.la
[...33691 lines suppressed...]
+* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2
+- Run make twice since there is an EOF error that makes the first run abort.
+
+* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1
+- Update to 1.7.
+
+* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2
+- Add -fPIC to the CFLAGS to fix transcode build on x86_64.
+
+* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1
+- Update to 1.6.
+- Split "main" into "utils" (bin) and "devel" (the static lib).
+- Add Makefile patch to ease install and get our CFLAGS used.
+- Don't enable MMX on x86_64, the x86 asm fails.
+
+* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5
+- Force __USE_LARGEFILE64 to fix FC4 ppc build.
+
+* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4
+- Add gcc4 patch.
+
+* Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3
+- Remove unneeded /usr/bin fix, since we don't use "make install".
+- Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4.
+- Make nasm mandatory : The configure script won't run without it anyway.
+- Use libdir/*.* in order to not catch all debuginfo files too.
+- Added -devel provides for now.
+
+* Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2
+- Fixes for x86_64.
+
+* Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1
+- Updated to release 1.5.4.
+
+* Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0
+- Updated to release 1.5.2.
+
+* Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0
+- Initial package. (using DAR)
diff --git a/mpeg2qt.c b/mpeg2qt.c
index 141237e..f2f1afc 100644
--- a/mpeg2qt.c
+++ b/mpeg2qt.c
@@ -71,6 +71,7 @@ void* trap_interrupt()
int main(int argc, char *argv[])
{
+ int error = 0;
int frame_count = -1;
char *row_pointers[3];
int do_audio = 0;
@@ -124,7 +125,7 @@ int main(int argc, char *argv[])
}
//printf("main 1\n");
- if(!(input = mpeg3_open(input_path)))
+ if(!(input = mpeg3_open(input_path, &error)))
{
exit(1);
}
@@ -180,7 +181,7 @@ int main(int argc, char *argv[])
//printf("main 1\n");
// quicktime_set_jpeg(output, 100, 0);
- mpeg3_set_mmx(input, 0);
+// mpeg3_set_mmx(input, 0);
while((!(do_video && mpeg3_end_of_video(input, layer)) ||
!(do_audio && mpeg3_end_of_audio(input, astream))) &&
diff --git a/mpeg3protos.h b/mpeg3protos.h
index c79a11b..6dec578 100644
--- a/mpeg3protos.h
+++ b/mpeg3protos.h
@@ -391,7 +391,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_t *demuxer, int title_number);
/* Go to the absolute byte given */
int mpeg3demux_seek_byte(mpeg3_demuxer_t *demuxer, int64_t byte);
-/* Seek to the title and cell containing the absolute byte of the
+/* Seek to the title and cell containing the absolute byte of the */
/* demuxer. */
/* Called at the beginning of every packet. */
int mpeg3_seek_phys(mpeg3_demuxer_t *demuxer);
diff --git a/mpeg3toc.c b/mpeg3toc.c
index f7c5284..50b201c 100644
--- a/mpeg3toc.c
+++ b/mpeg3toc.c
@@ -574,7 +574,7 @@ mpeg3demux_movie_size(input->atrack[j]->demuxer));
if(j == vtracks - 1 && l == frame_count - 1)
{
total_frames += frame_count;
- fprintf(stderr, "Video: title=%lld total_frames=%d ", title_number, total_frames);
+ fprintf(stderr, "Video: title=%lld total_frames=%d (%.1f \%)", title_number, total_frames,100*((float)position)/((float) mpeg3demux_movie_size(demuxer)));
}
}
}
diff --git a/mpeg3tocutil.c b/mpeg3tocutil.c
index 7afee58..540567f 100644
--- a/mpeg3tocutil.c
+++ b/mpeg3tocutil.c
@@ -1278,7 +1278,7 @@ void mpeg3_stop_toc(mpeg3_t *file)
// Store file information
PUT_INT32(FILE_INFO);
- fprintf(file->toc_fd, file->fs->path);
+ fprintf(file->toc_fd, "%s", file->fs->path);
for(j = strlen(file->fs->path); j < MPEG3_STRLEN; j++)
fputc(0, file->toc_fd);
PUT_INT64(file->source_date);
@@ -1309,7 +1309,7 @@ void mpeg3_stop_toc(mpeg3_t *file)
// Path
PUT_INT32(TITLE_PATH);
- fprintf(file->toc_fd, title->fs->path);
+ fprintf(file->toc_fd, "%s", title->fs->path);
// Pad path with 0
for(j = strlen(title->fs->path); j < MPEG3_STRLEN; j++)
diff --git a/video/Makefile.am b/video/Makefile.am
new file mode 100644
index 0000000..cba6ff5
--- /dev/null
+++ b/video/Makefile.am
@@ -0,0 +1,29 @@
+noinst_LTLIBRARIES = libmpeg3_video.la
+libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c motion.c \
+ mpeg3cache.c \
+ mpeg3video.c \
+ output.c \
+ reconstruct.c \
+ seek.c \
+ slice.c \
+ subtitle.c \
+ vlc.c
+
+if USEMMX
+libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
+else
+libmpeg3_video_la_SOURCES +=
+endif
+
+noinst_HEADERS = idct.h \
+ layerdata.h \
+ mpeg3video.h \
+ mpeg3videoprotos.h \
+ slice.h \
+ vlc.h
+
+libmpeg3_video_la_LDFLAGS=
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+INCLUDES=-I$(srcdir)/..
+
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
diff --git a/video/mmxidct.S b/video/mmxidct.S
index 9c3bebe..e40e7c9 100644
--- a/video/mmxidct.S
+++ b/video/mmxidct.S
@@ -673,3 +673,7 @@ IDCT_mmx:
ret
.Lfe1:
.size IDCT_mmx,.Lfe1-IDCT_mmx
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/video/output.c b/video/output.c
index 5c6f8fb..1c37d07 100644
--- a/video/output.c
+++ b/video/output.c
@@ -104,7 +104,7 @@ static unsigned char mpeg3_601_to_rgb[256];
*data++ = 0;
#define STORE_PIXEL_RGB565 \
- *((unsigned short*)data) = \
+ *(*(unsigned short**)(&data))++ = \
((CLIP(r_l) & 0xf8) << 8) | \
((CLIP(g_l) & 0xfc) << 3) | \
((CLIP(b_l) & 0xf8) >> 3); \
diff --git a/video/reconmmx.s b/video/reconmmx.s
index 1bb98ef..d9531cd 100644
--- a/video/reconmmx.s
+++ b/video/reconmmx.s
@@ -298,4 +298,6 @@ set_block_mmx:
pop esi
ret
-
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff --git a/video/vlc.c b/video/vlc.c
index 6ba853d..c20b2a8 100644
--- a/video/vlc.c
+++ b/video/vlc.c
@@ -1,3 +1,6 @@
+// FIXME: vlc.h redefines ERROR to 99 if and only if error is defined.
+#define ERROR
+
#include "mpeg3private.h"
#include "mpeg3protos.h"
#include "vlc.h"
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/libmpeg3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmpeg3.spec 30 Aug 2014 20:31:52 -0000 1.10
+++ libmpeg3.spec 22 Sep 2014 03:44:22 -0000 1.11
@@ -1,7 +1,7 @@
Summary: Decoder of various derivatives of MPEG standards
Name: libmpeg3
Version: 1.8
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://heroinewarrior.com/libmpeg3.php3
@@ -12,7 +12,7 @@
# git clone git@github.com:sergiomb2/libmpeg3.git
# tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
# git diff 1.8 . > "$date"_git"$tag".patch
-Patch0: 20140830_git6c02a5e.patch
+Patch0: 20140922_git47a2f45.patch
#BuildRequires: nasm
BuildRequires: a52dec-devel
@@ -123,6 +123,10 @@
%changelog
+* Mon Sep 22 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-7
+- Use 20140922_git47a2f45.patch, repo sergiomb2/libmpeg3 has been refactored,
+ almost just update git hash
+
* Tue Aug 26 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-6
- update to 20140830_git6c02a5e.patch (fixes when uses -Werror=format-security)
- add mpeg3protos.h to pkginclude_HEADERS
10 years, 2 months
rpms/pithos/devel sources,1.4,1.5
by Patrick Griffis
Author: tingping
Update of /cvs/free/rpms/pithos/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv553
Modified Files:
sources
Log Message:
Fix wrong source file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pithos/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Sep 2014 11:06:32 -0000 1.4
+++ sources 21 Sep 2014 11:12:36 -0000 1.5
@@ -1 +1 @@
-08f9f790b9e13ecdeba7e5da88065db8 pithos-1.0.1.tar.gz
+695c0bf05d6ca905af6b989b183bd9c6 pithos-1.0.1.tar.gz
10 years, 2 months
