diff options
author | Stefan Eßer <se@FreeBSD.org> | 2007-05-01 15:04:18 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2007-05-01 15:04:18 +0000 |
commit | 92534c310f54eacb34dd6adad2f86548883cd1fe (patch) | |
tree | 4681b0e31bb2ecfb362d7b022d3d996455f29584 /multimedia | |
parent | bcd159e5e9a20d289bbdd50494a512ffa730342e (diff) | |
download | ports-92534c310f54eacb34dd6adad2f86548883cd1fe.tar.gz ports-92534c310f54eacb34dd6adad2f86548883cd1fe.zip |
Notes
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/dvbcut/files/patch-SConstruct | 32 | ||||
-rw-r--r-- | multimedia/dvbcut/files/patch-defines.h | 15 | ||||
-rw-r--r-- | multimedia/dvbcut/files/patch-index.h | 31 |
3 files changed, 4 insertions, 74 deletions
diff --git a/multimedia/dvbcut/files/patch-SConstruct b/multimedia/dvbcut/files/patch-SConstruct index 0637c83271e8..928bd34888b3 100644 --- a/multimedia/dvbcut/files/patch-SConstruct +++ b/multimedia/dvbcut/files/patch-SConstruct @@ -20,35 +20,3 @@ env.Replace(CXXFILESUFFIX=".cpp") -@@ -48,7 +48,7 @@ - - env.Replace(CXXFILESUFFIX=".cpp") - --env.Append(CPPDEFINES={"_FILE_OFFSET_BITS": "64", "_LARGEFILE_SOURCE": None}) -+env.Append(CPPDEFINES=[("_FILE_OFFSET_BITS", "64"), "_LARGEFILE_SOURCE"]) - - for v in ("CXX","LINK"): - if (v in os.environ): -@@ -62,11 +62,11 @@ - - if (not env.GetOption('clean')): - if (conf.TryAction('pkg-config --exists ao')[0]): -- conf.env.Append(CPPDEFINES={"HAVE_LIB_AO":None}) -+ conf.env.Append(CPPDEFINES="HAVE_LIB_AO") - conf.env.ParseConfig('pkg-config --cflags --libs ao') - print "Checking for libao... found" - elif (conf.CheckLibWithHeader('ao', 'ao/ao.h', 'C')): -- conf.env.Append(CPPDEFINES={"HAVE_LIB_AO":None}) -+ conf.env.Append(CPPDEFINES="HAVE_LIB_AO") - conf.env.Append(LIBS=['ao']) - print "Checking for libao... found" - else: -@@ -85,7 +85,7 @@ - env.Replace(QT_LIB=qtlib) - - if (debug<=0): -- env.Append(CPPDEFINES={"QT_NO_DEBUG": None}) -+ env.Append(CPPDEFINES="QT_NO_DEBUG") - - ### FFMPEG - diff --git a/multimedia/dvbcut/files/patch-defines.h b/multimedia/dvbcut/files/patch-defines.h index ac0dd30724b9..e8ff0b5864f6 100644 --- a/multimedia/dvbcut/files/patch-defines.h +++ b/multimedia/dvbcut/files/patch-defines.h @@ -1,6 +1,6 @@ --- src/defines.h~ Sun Dec 11 21:13:26 2005 -+++ src/defines.h Mon Apr 9 17:28:13 2007 -@@ -40,16 +40,25 @@ ++++ src/defines.h Mon Dec 19 23:05:03 2005 +@@ -40,6 +40,12 @@ #endif } @@ -11,16 +11,9 @@ +#define htom16(x) htobe16(x) +#else #if __BYTE_ORDER == __LITTLE_ENDIAN --#define mbo32(x) (__bswap_constant_32(x)) -+#define mbo32(x) \ -+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ -+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) + #define mbo32(x) (__bswap_constant_32(x)) #define htom32(x) (__bswap_32(x)) --#define mbo16(x) (__bswap_constant_16(x)) -+#define mbo16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) - #define htom16(x) (__bswap_16(x)) - #else - #define mbo32(x) (x) +@@ -50,6 +56,7 @@ #define htom32(x) (x) #define mbo16(x) (x) #define htom16(x) (x) diff --git a/multimedia/dvbcut/files/patch-index.h b/multimedia/dvbcut/files/patch-index.h index 48cdee79c42e..c21f19c09aab 100644 --- a/multimedia/dvbcut/files/patch-index.h +++ b/multimedia/dvbcut/files/patch-index.h @@ -13,34 +13,3 @@ #include "types.h" #include "pts.h" #include "defines.h" -@@ -53,7 +53,7 @@ - picture(filepos_t pos, pts_t _pts, int framerate, int aspectratio, - int sequencenumber, int picturetype, bool seqheader=false) : - position( pos ), -- pts((_pts&0xffffffffffffll) | ((uint64_t)( (framerate&0xf)|((aspectratio&0xf)<<4)| -+ pts((_pts&0xffffffffffll) | ((uint64_t)( (framerate&0xf)|((aspectratio&0xf)<<4)| - ((sequencenumber&0x3ff)<<8)|((picturetype&0x3)<<18)|(seqheader?0x100000:0) )<<40)) - { } - picture() : position(0), pts(0) -@@ -66,7 +66,7 @@ - pts_t getpts() const - { - pts_t l=pts&0xffffffffffll; -- return (l&0x8000000000ll) ? (l|0xffffff0000000000ll):l; -+ return (l ^ 0x8000000000ll) - 0x8000000000ll; - } - int getframerate() const - { -@@ -136,10 +136,10 @@ - { - pic+=skipfirst; - int seq=pic; -- while (!p[seq].getseqheader()) -+ while (seq > 0 && !p[seq].getseqheader()) - --seq; - pic=pic-seq; -- while(p[seq].getsequencenumber()!=pic) -+ while(seq < pictures && p[seq].getsequencenumber()!=pic) - ++seq; - return seq; - } |