rpms/libmpeg3/devel 20140922_git47a2f45.patch, NONE, 1.1 libmpeg3.spec, 1.10, 1.11

Monday, 22 September 2014

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&gt; - 1.5.4-2
+- Fixes for x86_64.
+
+* Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com&gt; - 1.5.4-1
+- Updated to release 1.5.4.
+
+* Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com&gt; - 1.5.2-0
+- Updated to release 1.5.2.
+
+* Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com&gt; - 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&gt; - 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&gt; - 1.8-6
 - update to 20140830_git6c02a5e.patch (fixes when uses -Werror=format-security)
 - add mpeg3protos.h to pkginclude_HEADERS 

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpms/libmpeg3/devel 20140922_git47a2f45.patch, NONE, 1.1 libmpeg3.spec, 1.10, 1.11