diff options
| author | pav <pav@FreeBSD.org> | 2004-08-20 23:57:33 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-08-20 23:57:33 +0800 |
| commit | e97d50728f18d0536b8f9dffb5eb8e27b2da55fb (patch) | |
| tree | 36a7be7b0b5f12c989ffb7c9592bd18ffa4d0796 /multimedia/mjpegtools/files | |
| parent | e29aa3426e26c7825b92a474c8f2279248693dbe (diff) | |
| download | freebsd-ports-gnome-e97d50728f18d0536b8f9dffb5eb8e27b2da55fb.tar.gz freebsd-ports-gnome-e97d50728f18d0536b8f9dffb5eb8e27b2da55fb.tar.zst freebsd-ports-gnome-e97d50728f18d0536b8f9dffb5eb8e27b2da55fb.zip | |
- Fix build with gcc 3.4
- Fix plist
- Respect CC and CFLAGS
- Fix WITH_QUICKTIME knob
PR: ports/69452, ports/69595
Submitted by: Michael Johnson <ahze@ahze.net>,
Christian Hiris <4711@chello.at>
Approved by: maintainer timeout (1 month)
Diffstat (limited to 'multimedia/mjpegtools/files')
| -rw-r--r-- | multimedia/mjpegtools/files/patch-configure | 23 | ||||
| -rw-r--r-- | multimedia/mjpegtools/files/patch-lavtools::lavpipe.c | 10 | ||||
| -rw-r--r-- | multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc | 15 |
3 files changed, 48 insertions, 0 deletions
diff --git a/multimedia/mjpegtools/files/patch-configure b/multimedia/mjpegtools/files/patch-configure new file mode 100644 index 000000000000..2272d1c6f4b5 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-configure @@ -0,0 +1,23 @@ +--- configure.orig Thu Jul 22 18:15:58 2004 ++++ configure Thu Jul 22 18:16:36 2004 +@@ -25858,16 +25858,16 @@ + fi + have_cmov=false + case $arch in +- i786) ARCHFLAGS="-mcpu=i786 -march=$arch" ++ i786) ARCHFLAGS="" + have_cmov=true + ;; +- i686) ARCHFLAGS="-mcpu=i686 -march=$arch" ++ i686) ARCHFLAGS="" + have_cmov=true + ;; +- i586) ARCHFLAGS="-mcpu=i586 -march=$arch" ++ i586) ARCHFLAGS="" + have_cmov=false + ;; +- *) ARCHFLAGS="-mcpu=i686 -march=$arch" ++ *) ARCHFLAGS="" + have_cmov=true + ;; + esac diff --git a/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c b/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c new file mode 100644 index 000000000000..981a612354b5 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c @@ -0,0 +1,10 @@ +--- lavtools/lavpipe.c.orig Thu Jul 22 18:17:47 2004 ++++ lavtools/lavpipe.c Thu Jul 22 18:18:08 2004 +@@ -582,6 +582,7 @@ + mjpeg_info( "closing input %d (source %d)", i, current_index); + decommission_pipe_source(source); + KEEP_SOURCE: ++ ; + } + } + } diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc b/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc new file mode 100644 index 000000000000..f69b9f43ff7c --- /dev/null +++ b/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc @@ -0,0 +1,15 @@ +--- mpeg2enc/picture.cc.orig Thu Jul 22 18:23:54 2004 ++++ mpeg2enc/picture.cc Thu Jul 22 18:24:32 2004 +@@ -83,9 +83,9 @@ + } + + +- curref = new (uint8_t *)[5]; +- curorg = new (uint8_t *)[5]; +- pred = new (uint8_t *)[5]; ++ curref = new uint8_t * [5]; ++ curorg = new uint8_t * [5]; ++ pred = new uint8_t * [5]; + + for( i = 0 ; i<3; i++) + { |