- 1.5.3, updated declaration patch, removed obsolete pthread,int64 patches

Changed files:
    libmpeg3-declaration.patch -> 1.2
    libmpeg3-int64.patch -> 1.2
    libmpeg3-pthread.patch -> 1.2
    libmpeg3.spec -> 1.36

diff --git a/libmpeg3-declaration.patch b/libmpeg3-declaration.patch
index 31e0542b12dd5cc34dc5a76aad24c2e5d773f46f..f6bcd0b7a974ea078efcb767d2439d65dd627cb0 100644 (file)
--- a/libmpeg3-declaration.patch
+++ b/libmpeg3-declaration.patch
@@ -1,13 +1,14 @@
---- libmpeg3-1.5.1/mpeg3toc.c~ Wed May 28 23:52:24 2003
-+++ libmpeg3-1.5.1/mpeg3toc.c  Wed May 28 23:55:18 2003
-@@ -196,9 +196,9 @@
+--- libmpeg3-1.5.3/mpeg3toc.c~ Wed May 28 23:52:24 2003
++++ libmpeg3-1.5.3/mpeg3toc.c  Wed May 28 23:55:18 2003
+@@ -196,10 +196,10 @@
                                if(!mpeg3_end_of_audio(input, j))
                                {
  // Don't want to maintain separate vectors for offset and title.
 -                                      title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
-                                       int64_t position = mpeg3demux_tell(input->atrack[j]->demuxer);
+                                       int64_t position = mpeg3demux_tell_relative(input->atrack[j]->demuxer);
                                        int64_t result;
+ 
 +                                      title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
-                                       if(position < MPEG3_IO_SIZE) position = MPEG3_IO_SIZE;
-                                       result = (title_number << 56) | (position - MPEG3_IO_SIZE);
+ //                                    if(position < MPEG3_IO_SIZE) position = MPEG3_IO_SIZE;
+ //                                    result = (title_number << 56) | (position - MPEG3_IO_SIZE);
  

diff --git a/libmpeg3-int64.patch b/libmpeg3-int64.patch
deleted file mode 100644 (file)
index 95147f8..0000000
--- a/libmpeg3-int64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- libmpeg3-1.5.1/audio/mpeg3audio.c.orig     Wed May 28 23:33:05 2003
-+++ libmpeg3-1.5.1/audio/mpeg3audio.c  Wed May 28 23:33:13 2003
-@@ -532,9 +532,9 @@
-                       index = audio->sample_seek / MPEG3_AUDIO_CHUNKSIZE;
-                       if(index >= track->total_sample_offsets) index = track->total_sample_offsets - 1;
-                       title_number = (track->sample_offsets[index] & 
--                              0xff00000000000000) >> 56;
-+                              0xff00000000000000LL) >> 56;
-                       byte = track->sample_offsets[index] &
--                              0xffffffffffffff;
-+                              0xffffffffffffffLL;
- 
-                       mpeg3demux_open_title(demuxer, title_number);
-                       mpeg3demux_seek_byte(demuxer, byte);
---- libmpeg3-1.5.1/video/seek.c.orig   Wed May 28 23:32:47 2003
-+++ libmpeg3-1.5.1/video/seek.c        Wed May 28 23:33:00 2003
-@@ -263,9 +263,9 @@
- 
-                                               frame = track->keyframe_numbers[i];
-                                               title_number = (track->frame_offsets[frame] & 
--                                                      0xff00000000000000) >> 56;
-+                                                      0xff00000000000000LL) >> 56;
-                                               byte = track->frame_offsets[frame] & 
--                                                        0xffffffffffffff;
-+                                                        0xffffffffffffffLL;
- 
-                                               video->framenum = track->keyframe_numbers[i];
- 

diff --git a/libmpeg3-pthread.patch b/libmpeg3-pthread.patch
deleted file mode 100644 (file)
index c4eef86..0000000
--- a/libmpeg3-pthread.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmpeg3-1.5.0/mpeg3private.h~     Fri Oct 18 03:38:19 2002
-+++ libmpeg3-1.5.0/mpeg3private.h      Wed Mar 19 17:26:21 2003
-@@ -3,6 +3,7 @@
- 
- #include <stdint.h>
- #include <stdio.h>
-+#include <pthread.h>
- 
- 
- 

diff --git a/libmpeg3.spec b/libmpeg3.spec
index a6bdcccd85f1ce1e05b8f69385920319ef3a2bb4..9f642dc04f210b7b9470f078503906ac5eae6d58 100644 (file)
--- a/libmpeg3.spec
+++ b/libmpeg3.spec
@@ -1,16 +1,14 @@
 Summary:       LibMPEG3 decodes the many many derivatives of MPEG standards
 Summary(pl):   LibMPEG3 dekoduje wiele alternatywnych standardów MPEG
 Name:          libmpeg3
-Version:       1.5.2
+Version:       1.5.3
 Release:       1
 License:       GPL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
-# Source0-md5: d2b12624e8e2eed1a03c4f837f33a90f
+# Source0-md5: 7cd5d6d6a98f54b10ee6e26f14ff5841
 Patch0:                %{name}-acam.patch
-Patch1:                %{name}-pthread.patch
-Patch2:                %{name}-int64.patch
-Patch3:                %{name}-declaration.patch
+Patch1:                %{name}-declaration.patch
 URL:           http://heroinewarrior.com/libmpeg3.php3
 BuildRequires: a52dec-libs-devel
 BuildRequires: autoconf
@@ -89,8 +87,6 @@ MPEG.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}