rpms/bsnes/devel bsnes.spec,1.52,1.53
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/bsnes/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2358
Modified Files:
bsnes.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bsnes.spec 21 Jul 2013 13:48:48 -0000 1.52
+++ bsnes.spec 30 Aug 2014 23:59:55 -0000 1.53
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SNES emulator focused on accuracy
License: GPLv3
@@ -115,6 +115,9 @@
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 0.091-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.091-2
- Add ExclusiveArch - rfbz#2406
10 years, 6 months
rpms/BasiliskII/devel BasiliskII.spec,1.10,1.11
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/BasiliskII/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2225
Modified Files:
BasiliskII.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: BasiliskII.spec
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasiliskII.spec 10 Mar 2013 19:48:59 -0000 1.10
+++ BasiliskII.spec 30 Aug 2014 23:59:32 -0000 1.11
@@ -4,7 +4,7 @@
Summary: 68k Macintosh emulator
Name: BasiliskII
Version: 1.0
-Release: 0.%{date}.4%{?dist}
+Release: 0.%{date}.4%{?dist}.1
License: GPLv2+
URL: http://basilisk.cebix.net/
# GRRR github, no url ...
@@ -102,6 +102,9 @@
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 1.0-0.20130310.4.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0-0.20130310.4
- New upstream: http://basilisk.cebix.net/
- Uses github, no source tarbals :| Update to todays git master (bbc0af47)
10 years, 6 months
rpms/audacity-freeworld/devel audacity-freeworld.spec,1.30,1.31
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1983
Modified Files:
audacity-freeworld.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- audacity-freeworld.spec 30 Sep 2013 08:39:45 -0000 1.30
+++ audacity-freeworld.spec 30 Aug 2014 23:59:06 -0000 1.31
@@ -1,7 +1,7 @@
Name: audacity-freeworld
Version: 2.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -175,6 +175,9 @@
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 2.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-3
- Rebuilt
10 years, 6 months
rpms/arcem/devel arcem.spec,1.6,1.7
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/arcem/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1854
Modified Files:
arcem.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: arcem.spec
===================================================================
RCS file: /cvs/free/rpms/arcem/devel/arcem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- arcem.spec 28 Oct 2013 13:40:42 -0000 1.6
+++ arcem.spec 30 Aug 2014 23:58:49 -0000 1.7
@@ -1,6 +1,6 @@
Name: arcem
Version: 1.50
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Highly portable Acorn Archimedes emulator
License: GPLv2+
@@ -130,6 +130,9 @@
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 1.50-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Mon Oct 28 2013 Andrea Musuruane <musuruan(a)gmail.com> 1.50-2
- Dropped desktop vendor tag for F19+
- Dropped cleaning at the beginning of %%install
10 years, 6 months
rpms/amule/devel amule.spec,1.21,1.22
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/amule/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1701
Modified Files:
amule.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/devel/amule.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- amule.spec 5 Jan 2014 23:05:38 -0000 1.21
+++ amule.spec 30 Aug 2014 23:58:38 -0000 1.22
@@ -3,7 +3,7 @@
Name: amule
Version: 2.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
@@ -171,6 +171,9 @@
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 2.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Thu Jan 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-5
- Drop docdir and desktop vendor
10 years, 6 months
rpms/a52dec/devel a52dec.spec,1.8,1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/a52dec/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1329
Modified Files:
a52dec.spec
Log Message:
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/devel/a52dec.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- a52dec.spec 10 Mar 2013 11:37:15 -0000 1.8
+++ a52dec.spec 30 Aug 2014 23:48:16 -0000 1.9
@@ -1,7 +1,7 @@
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
-Release: 18%{?dist}
+Release: 19%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
@@ -82,6 +82,9 @@
#---------------------------------------------------------------------
%changelog
+* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 0.7.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Mar 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.4-18
- Add silence patch as we don't built with DJBFFT enabled
10 years, 6 months
rpms/libmpeg3/F-20 20140830_git6c02a5e.patch, NONE, 1.1 libmpeg3.spec, 1.6, 1.7 libmpeg3-1.5.2-gnustack.patch, 1.1, NONE libmpeg3-1.7-boostrap.patch, 1.1, NONE libmpeg3-1.7-cinelerra_hacking.patch, 1.1, NONE libmpeg3-1.7-fix_commented.patch, 1.1, NONE libmpeg3-1.7-mpeg2qt-args.patch, 1.1, NONE libmpeg3-1.7-pkgconfig.in.patch, 1.1, NONE libmpeg3-1.7-spec_in.patch, 1.1, NONE libmpeg3-1.8-cinelerra_autotools.patch, 1.1, NONE libmpeg3-1.8-mmx.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-serv25481
Modified Files:
libmpeg3.spec
Added Files:
20140830_git6c02a5e.patch
Removed Files:
libmpeg3-1.5.2-gnustack.patch libmpeg3-1.7-boostrap.patch
libmpeg3-1.7-cinelerra_hacking.patch
libmpeg3-1.7-fix_commented.patch
libmpeg3-1.7-mpeg2qt-args.patch
libmpeg3-1.7-pkgconfig.in.patch libmpeg3-1.7-spec_in.patch
libmpeg3-1.8-cinelerra_autotools.patch libmpeg3-1.8-mmx.patch
Log Message:
* 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
- use https://github.com/sergiomb2/libmpeg3 with all patches
- spec clean up
20140830_git6c02a5e.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/.gitignore | 23
b/COPYING | 72
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
104 files changed, 476 insertions(+), 32855 deletions(-)
--- NEW FILE 20140830_git6c02a5e.patch ---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4d40434
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
index 1ad9cd3..22fbe5d 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., <http://fsf.org/>
+ 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>
+ {description}
+ Copyright (C) {year} {fullname}
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,17 +323,17 @@ 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
`Gnomovision' (which makes passes at compilers) written by James Hacker.
- <signature of Ty Coon>, 1 April 1989
+ {signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice
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
-Public License instead of this License.
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
[...33728 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmpeg3.spec 3 Mar 2013 21:41:15 -0000 1.6
+++ libmpeg3.spec 30 Aug 2014 20:57:52 -0000 1.7
@@ -1,23 +1,19 @@
Summary: Decoder of various derivatives of MPEG standards
Name: libmpeg3
Version: 1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://heroinewarrior.com/libmpeg3.php3
Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
-Patch1: libmpeg3-1.8-cinelerra_autotools.patch
-Patch2: libmpeg3-1.7-cinelerra_hacking.patch
-Patch3: libmpeg3-1.7-fix_commented.patch
-Patch4: libmpeg3-1.7-spec_in.patch
-Patch5: libmpeg3-1.7-pkgconfig.in.patch
-Patch6: libmpeg3-1.7-boostrap.patch
-# Patches 7/8 from gentoo
-#http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libmpeg3/files/
-Patch7: libmpeg3-1.5.2-gnustack.patch
-Patch9: libmpeg3-1.7-mpeg2qt-args.patch
-Patch10: libmpeg3-1.8-mmx.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# patch from https://github.com/sergiomb2/libmpeg3
+# date=$(date +%Y%m%d)
+# 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
+
#BuildRequires: nasm
BuildRequires: a52dec-devel
BuildRequires: libquicktime-devel
@@ -63,41 +59,8 @@
%prep
%setup -q
-# Removed unneeded files
-rm -rf a52dec-* depend.a52
-
-# Patch autotools
-%patch1 -p1
-
-# Thoses patches was taken from cinepaint cvs
-# Which have special libmpeg3
-%patch2 -p1 -b .cine_hack
-
-# Fix comments
-%patch3 -p1 -b .commented
-
-# Add spec.in
-%patch4 -p1
-
-# Add pkgconfig.in
-%patch5 -p1
-
-# Add ./bootstrap
-%patch6 -p1
-
-# gentoo patches
-%patch7 -p1 -b .gnustack
+%patch0 -p1 -b .github
-# Patch the number of arguments of mpeg2qt
-%patch9 -p1 -b .args
-
-# Patch to add mmx possibility via nasm/yasm
-%patch10 -p1 -b .mmx
-
-# Touch docs files:
-touch INSTALL README NEWS AUTHORS ChangeLog
-
-# Build autotools
chmod 755 bootstrap
./bootstrap
@@ -124,10 +87,7 @@
make %{?_smp_mflags}
-
%install
-%{__rm} -rf %{buildroot}
-
%{__make} install \
LIBDIR=%{_libdir} \
DESTDIR=%{buildroot} \
@@ -136,10 +96,6 @@
%{__rm} -rf %{buildroot}%{_libdir}/*.la
-%clean
-%{__rm} -rf %{buildroot}
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -167,6 +123,12 @@
%changelog
+* 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
+- use https://github.com/sergiomb2/libmpeg3 with all patches
+- spec clean up
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8-5
- Mass rebuilt for Fedora 19 Features
@@ -184,7 +146,7 @@
- Upate to 1.8
- Enable cinelerra-cv hacks
-* Sat Jan 10 2008 kwizart < kwizart at gmail.com > - 1.7-6
+* Sat Jan 12 2008 kwizart < kwizart at gmail.com > - 1.7-6
- Fix mpeg2qt linked with libquicktime
- Disable mmx
--- libmpeg3-1.5.2-gnustack.patch DELETED ---
--- libmpeg3-1.7-boostrap.patch DELETED ---
--- libmpeg3-1.7-cinelerra_hacking.patch DELETED ---
--- libmpeg3-1.7-fix_commented.patch DELETED ---
--- libmpeg3-1.7-mpeg2qt-args.patch DELETED ---
--- libmpeg3-1.7-pkgconfig.in.patch DELETED ---
--- libmpeg3-1.7-spec_in.patch DELETED ---
--- libmpeg3-1.8-cinelerra_autotools.patch DELETED ---
--- libmpeg3-1.8-mmx.patch DELETED ---
10 years, 6 months
rpms/libmpeg3/devel 20140830_git6c02a5e.patch, NONE, 1.1 libmpeg3.spec, 1.9, 1.10 20140826_git395120d.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-serv24780
Modified Files:
libmpeg3.spec
Added Files:
20140830_git6c02a5e.patch
Removed Files:
20140826_git395120d.patch
Log Message:
* 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
- use https://github.com/sergiomb2/libmpeg3 with all patches
- spec clean up
20140830_git6c02a5e.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/.gitignore | 23
b/COPYING | 72
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
104 files changed, 476 insertions(+), 32855 deletions(-)
--- NEW FILE 20140830_git6c02a5e.patch ---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4d40434
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
index 1ad9cd3..22fbe5d 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., <http://fsf.org/>
+ 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>
+ {description}
+ Copyright (C) {year} {fullname}
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,17 +323,17 @@ 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
`Gnomovision' (which makes passes at compilers) written by James Hacker.
- <signature of Ty Coon>, 1 April 1989
+ {signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice
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
-Public License instead of this License.
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
[...33728 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmpeg3.spec 26 Aug 2014 01:43:07 -0000 1.9
+++ libmpeg3.spec 30 Aug 2014 20:31:52 -0000 1.10
@@ -6,12 +6,13 @@
Group: System Environment/Libraries
URL: http://heroinewarrior.com/libmpeg3.php3
Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
+
# patch from https://github.com/sergiomb2/libmpeg3
# date=$(date +%Y%m%d)
# 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: 20140826_git395120d.patch
+Patch0: 20140830_git6c02a5e.patch
#BuildRequires: nasm
BuildRequires: a52dec-devel
@@ -123,6 +124,7 @@
%changelog
* 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
- use https://github.com/sergiomb2/libmpeg3 with all patches
- spec clean up
--- 20140826_git395120d.patch DELETED ---
10 years, 6 months
rpms/moc/F-20 .cvsignore,1.5,1.6 moc.spec,1.4,1.5 sources,1.5,1.6
by Antonio
Author: sagitter
Update of /cvs/free/rpms/moc/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12275/F-20
Modified Files:
.cvsignore moc.spec sources
Log Message:
Update to new stable release 2.5.0 .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 May 2014 15:52:42 -0000 1.5
+++ .cvsignore 30 Aug 2014 13:20:39 -0000 1.6
@@ -1 +1 @@
-moc-2.5.0-14.beta2.tar.gz
+moc-2.5.0.tar.bz2
Index: moc.spec
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/moc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moc.spec 13 May 2014 15:52:42 -0000 1.4
+++ moc.spec 30 Aug 2014 13:20:40 -0000 1.5
@@ -4,24 +4,24 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.5.0
-Release: 0.15.beta2%{?dist}
+Release: 1%{?dist}
License: GPLv2+ and GPLv3+
URL: http://www.moc.daper.net
## Source archive from svn #2641; obtained by:
## svn co svn://daper.net/moc/trunk
-## tar -czvf moc-2.5.0-14.beta2.tar.gz trunk
-Source0: %{name}-%{version}-14.beta2.tar.gz
+## tar -czvf moc-2.5.0-17.beta2.tar.gz trunk
+## Source0: %%{name}-%%{version}-17.beta2.tar.gz
+
+Source0: http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.0.tar.bz2
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(samplerate)
-BuildRequires: ffmpeg-devel
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(speex)
-BuildRequires: libmad-devel
BuildRequires: pkgconfig(id3tag)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(flac)
@@ -38,9 +38,18 @@
BuildRequires: librcc-devel
BuildRequires: libquvi-devel, popt-devel
+%ifnarch armv6hl armv7hl
+BuildRequires: ffmpeg-devel
+BuildRequires: libmad-devel
+%endif
+
+
BuildRequires: autoconf, automake
-Requires: ffmpeg
+%ifnarch armv6hl armv7hl
+Requires: ffmpeg
+%endif
+
Requires: opus
Requires: libquvi, libquvi-scripts, popt
@@ -51,20 +60,28 @@
files in this directory beginning from the chosen file.
%prep
-%setup -q -n trunk
+%setup -q -n %{name}-%{version}
%build
## Compilation files built temporary
mv configure.in configure.ac
-autoreconf -i
-
+autoreconf -ivf
+%ifarch armv6hl armv7hl
+%configure --disable-static --disable-silent-rules \
+ --disable-rpath --with-rcc \
+ --with-oss --with-alsa --with-jack --without-aac --with-mp3 \
+ --with-musepack --with-vorbis --with-flac --with-wavpack \
+ --with-sndfile --with-modplug --without-ffmpeg --with-speex \
+ --with-samplerate --with-curl --disable-debug --without-magic
+%else
%configure --disable-static --disable-silent-rules \
--disable-rpath --with-rcc \
--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
--with-musepack --with-vorbis --with-flac --with-wavpack \
--with-sndfile --with-modplug --with-ffmpeg --with-speex \
--with-samplerate --with-curl --disable-debug --without-magic
+%endif
make %{?_smp_mflags}
%install
@@ -94,6 +111,13 @@
%{_libdir}/%{name}/decoder_plugins
%changelog
+* Sat Aug 30 2014 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-1
+- Update to release 2.5.0 (Consolidation)
+
+* Thu Aug 07 2014 Sérgio Basto <sergio(a)serjux.com> - 2.5.0-0.16.beta2
+- Rebuilt for ffmpeg-2.3
+- Conditional builds for ARM
+
* Tue May 13 2014 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.15.beta2
- New svn commit of MOC-2.5.0 pre-release (r2641)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 May 2014 15:52:42 -0000 1.5
+++ sources 30 Aug 2014 13:20:40 -0000 1.6
@@ -1 +1 @@
-c372dba711fd569ab5ca52351371359c moc-2.5.0-14.beta2.tar.gz
+18e3a979b67091bfee4b62217908c473 moc-2.5.0.tar.bz2
10 years, 6 months