From f305d560b181d592b6d6e6cc4abda32fe80ee1f5 Mon Sep 17 00:00:00 2001 From: Aldas Nabazas Date: Thu, 2 Oct 2008 19:41:37 +0300 Subject: [PATCH] mjpegtools: Updated (1.8.0 -> 1.9.0rc3) and removed NOPARALLEL --- .../mjpegtools/hotfix_libquicktime.patch | 28 ------------------- multimedia/mjpegtools/mjpegtools.desc | 10 +++---- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 multimedia/mjpegtools/hotfix_libquicktime.patch diff --git a/multimedia/mjpegtools/hotfix_libquicktime.patch b/multimedia/mjpegtools/hotfix_libquicktime.patch deleted file mode 100644 index af3528d86..000000000 --- a/multimedia/mjpegtools/hotfix_libquicktime.patch +++ /dev/null @@ -1,28 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../mjpegtools/hotfix_libquicktime.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -diff -Nur mjpegtools-1.8.0-orig/lavtools/lav_io.c mjpegtools-1.8.0/lavtools/lav_io.c ---- mjpegtools-1.8.0-orig/lavtools/lav_io.c 2005-08-27 11:47:20.000000000 +0000 -+++ mjpegtools-1.8.0/lavtools/lav_io.c 2006-01-28 11:03:16.152857000 +0000 -@@ -1367,7 +1367,7 @@ - break; - #ifdef HAVE_LIBQUICKTIME - case 'q': -- res = fileno(((quicktime_t *)lav_file->qt_fd)->stream); -+ res = lqt_fileno((quicktime_t *)lav_file->qt_fd); - break; - #endif - default: diff --git a/multimedia/mjpegtools/mjpegtools.desc b/multimedia/mjpegtools/mjpegtools.desc index d338cc46f..37cff209a 100644 --- a/multimedia/mjpegtools/mjpegtools.desc +++ b/multimedia/mjpegtools/mjpegtools.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../mjpegtools/mjpegtools.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -29,13 +28,12 @@ [A] Gernot Ziegler [M] The OpenSDE Community -[F] NOPARALLEL FPIC-QUIRK +[F] FPIC-QUIRK [C] extra/multimedia [L] GPL [S] Stable -[V] 1.8.0 +[V] 1.9.0rc3 [P] X -----5---9 157.200 -[D] 3871400418 mjpegtools-1.8.0.tar.gz http://dl.sourceforge.net/sourceforge/mjpeg/ - +[D] 3101245274 mjpegtools-1.9.0rc3.tar.gz http://dl.sourceforge.net/sourceforge/mjpeg/