OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Jun-2009 21:07:26
Branch: HEAD Handle: 2009061220072500
Modified files:
openpkg-src/flvtoolxx flvtoolxx.patch flvtoolxx.spec
Log:
upgrading package: flvtoolxx 1.1.7 -> 1.2.0
Summary:
Revision Changes Path
1.3 +16 -24 openpkg-src/flvtoolxx/flvtoolxx.patch
1.5 +5 -5 openpkg-src/flvtoolxx/flvtoolxx.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flvtoolxx/flvtoolxx.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 flvtoolxx.patch
--- openpkg-src/flvtoolxx/flvtoolxx.patch 8 Mar 2009 09:20:52 -0000
1.2
+++ openpkg-src/flvtoolxx/flvtoolxx.patch 12 Jun 2009 19:07:25 -0000
1.3
@@ -1,6 +1,6 @@
Index: AMFData.h
--- AMFData.h.orig 2009-01-22 02:09:49 +0100
-+++ AMFData.h 2009-03-08 10:17:14 +0100
++++ AMFData.h 2009-06-12 20:59:31 +0200
@@ -17,13 +17,20 @@
#ifdef __APPLE__
#include <architecture/byte_order.h>
@@ -25,7 +25,7 @@
enum AMFType {
Index: SConscript
--- SConscript.orig 2007-06-05 05:35:40 +0200
-+++ SConscript 2009-03-08 10:17:14 +0100
++++ SConscript 2009-06-12 20:59:31 +0200
@@ -4,6 +4,6 @@
source = ['flvtool++.cpp',
'AMFData.cpp'],
@@ -36,7 +36,7 @@
Return('flvtoolxx')
Index: SConstruct
--- SConstruct.orig 2008-10-17 03:00:36 +0200
-+++ SConstruct 2009-03-08 10:17:14 +0100
++++ SConstruct 2009-06-12 20:59:31 +0200
@@ -1,5 +1,5 @@
libd = '#lib/'
-env = Environment(CPPFLAGS='-ggdb -O3 -Wall', LINKFLAGS='-ggdb')
@@ -45,28 +45,26 @@
Export('env libd')
Index: flvtool++.cpp
---- flvtool++.cpp.orig 2009-01-22 22:46:02 +0100
-+++ flvtool++.cpp 2009-03-08 10:17:39 +0100
-@@ -51,7 +51,7 @@
+--- flvtool++.cpp.orig 2009-06-12 08:59:01 +0200
++++ flvtool++.cpp 2009-06-12 21:01:07 +0200
+@@ -52,7 +52,7 @@
int main(int argc, char* argv[]) {
if (argc < 2) {
- printf("flvtool++ 1.1.6\nCopyright (c) 2007-2008 Dan Weatherford and
Facebook, inc.\n");
-+ printf("flvtool++ 1.1.7\nCopyright (c) 2007-2008 Dan Weatherford and
Facebook, inc.\n");
++ printf("flvtool++ 1.2.0\nCopyright (c) 2007-2009 Dan Weatherford and
Facebook, inc.\n");
printf("http://developers.facebook.com/opensource.php\n";);
printf("Published under the BSD license.\n\n");
printf("usage: flvtool++ [options] [input filename] [output
filename]\n");
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,7 @@
case 2: codec = "H.263"; break;
case 3: codec = "SCREEN"; break;
case 4: codec = "VP6"; break;
+ case 5: codec = "VP6A"; break;
-+ case 6: codec = "SCREEN2"; break;
-+ case 7: codec = "H.264"; break;
+ case 6: codec = "SCREEN v2"; break;
+ case 7: codec = "H.264"; break;
default: codec = "(unknown)";
- };
- // Scrape width & height data from the video
-@@ -295,11 +298,13 @@
+@@ -389,7 +390,7 @@
onMetaData->dmap["stereo"] = shared_ptr<AMFData>(new
AMFBoolean(stereo));
const char* audio_format_str = NULL;
switch (audio_format) {
@@ -74,17 +72,11 @@
+ case 0: audio_format_str = "Uncompressed (PCM)"; break;
case 1: audio_format_str = "ADPCM"; break;
case 2: audio_format_str = "MP3"; break;
- case 5: audio_format_str = "NellyMoser (8kHz Mono special
case)"; break;
- case 6: audio_format_str = "NellyMoser"; break;
-+ case 10: audio_format_str = "AAC"; break;
-+ case 11: audio_format_str = "Speex"; break;
- }
- printf("Audio: %dHz %dbit %s, codec ID %d (%s)\n", audio_rate,
audio_sample_size, (stereo ? "stereo" : "mono"), audio_format,
audio_format_str);
- have_audio_params = true;
+ case 3: audio_format_str = "Linear PCM (little endian)"; break;
Index: serialized_buffer.h
---- serialized_buffer.h.orig 2008-11-05 01:54:15 +0100
-+++ serialized_buffer.h 2009-03-08 10:17:14 +0100
-@@ -17,7 +17,7 @@
+--- serialized_buffer.h.orig 2009-06-12 08:58:56 +0200
++++ serialized_buffer.h 2009-06-12 20:59:31 +0200
+@@ -18,7 +18,7 @@
#define LE32(x) OSSwapLittleToHostInt32(x)
#define LE64(x) OSSwapLittleToHostInt64(x)
@@ -93,7 +85,7 @@
#include <byteswap.h>
#include <endian.h>
-@@ -38,6 +38,26 @@
+@@ -39,6 +39,26 @@
#define LE64(x) __bswap_64(x)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flvtoolxx/flvtoolxx.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 flvtoolxx.spec
--- openpkg-src/flvtoolxx/flvtoolxx.spec 18 Apr 2009 13:10:21 -0000
1.4
+++ openpkg-src/flvtoolxx/flvtoolxx.spec 12 Jun 2009 19:07:25 -0000
1.5
@@ -24,18 +24,18 @@
# package information
Name: flvtoolxx
Summary: Flash Video Manipulation Tool
-URL: http://mirror.facebook.com/facebook/flvtool++/
+URL: http://mirror.facebook.net/facebook/flvtool++/
Vendor: Facebook Inc.
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: EVAL
Group: Video
License: BSD
-Version: 1.1.7
-Release: 20090308
+Version: 1.2.0
+Release: 20090612
# list of sources
-Source0:
http://mirror.facebook.com/facebook/flvtool++/flvtool++-%{version}.tar.gz
+Source0:
http://mirror.facebook.net/facebook/flvtool++/flvtool++-%{version}.tar.gz
Patch0: flvtoolxx.patch
# build information
@@ -55,7 +55,7 @@
%track
prog flvtoolxx = {
version = %{version}
- url = http://mirror.facebook.com/facebook/flvtool++/
+ url = http://mirror.facebook.net/facebook/flvtool++/
regex = flvtool\+\+-(__VER__)\.tar\.gz
}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
