diff options
| -rw-r--r-- | multimedia/mjpegtools/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/mjpegtools/files/patch-configure | 105 | ||||
| -rw-r--r-- | multimedia/mjpegtools/files/patch-mplex_main.cpp | 50 |
3 files changed, 156 insertions, 0 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index b1373e9d29f3..80c7300587e0 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,6 +7,7 @@ PORTNAME= mjpegtools DISTVERSION= 1.6.3-rc1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg diff --git a/multimedia/mjpegtools/files/patch-configure b/multimedia/mjpegtools/files/patch-configure new file mode 100644 index 000000000000..d1ccb57f675e --- /dev/null +++ b/multimedia/mjpegtools/files/patch-configure @@ -0,0 +1,105 @@ +--- configure.orig Mon Jul 18 10:11:33 2005 ++++ configure Mon Jul 18 10:12:48 2005 +@@ -24288,6 +24288,104 @@ + have_libpng=false + fi + ++ if test x$have_libpng = xfalse ; then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for libpng12" >&5 ++echo $ECHO_N "checking for libpng12... $ECHO_C" >&6 ++ ++ if $PKG_CONFIG --exists "libpng12" ; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ succeeded=yes ++ ++ echo "$as_me:$LINENO: checking LIBPNG_CFLAGS" >&5 ++echo $ECHO_N "checking LIBPNG_CFLAGS... $ECHO_C" >&6 ++ LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12"` ++ echo "$as_me:$LINENO: result: $LIBPNG_CFLAGS" >&5 ++echo "${ECHO_T}$LIBPNG_CFLAGS" >&6 ++ ++ echo "$as_me:$LINENO: checking LIBPNG_LIBS" >&5 ++echo $ECHO_N "checking LIBPNG_LIBS... $ECHO_C" >&6 ++ LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng12"` ++ echo "$as_me:$LINENO: result: $LIBPNG_LIBS" >&5 ++echo "${ECHO_T}$LIBPNG_LIBS" >&6 ++ else ++ LIBPNG_CFLAGS="" ++ LIBPNG_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ have_libpng=true ++ else ++ have_libpng=false ++ fi ++ ++ fi + fi diff --git a/multimedia/mjpegtools/files/patch-mplex_main.cpp b/multimedia/mjpegtools/files/patch-mplex_main.cpp new file mode 100644 index 000000000000..f9444738a3b5 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-mplex_main.cpp @@ -0,0 +1,50 @@ +--- mplex/main.cpp.orig Thu Dec 9 21:13:26 2004 ++++ mplex/main.cpp Mon Jul 18 21:11:07 2005 +@@ -38,6 +38,7 @@ + #endif + #include <ctype.h> + #include <math.h> ++#include <fcntl.h> + #include "cpu_accel.h" + #include "mjpeg_types.h" + #include "mjpeg_logging.h" +@@ -107,6 +108,13 @@ + mjpeg_error_exit1( "Could not open for writing: %s", cur_filename ); + } + ++ { ++ int flags; ++ ++ (void)fcntl(fileno(strm), F_GETFL, &flags); ++ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK); ++ } ++ + return 0; + } + +@@ -144,6 +152,12 @@ + { + mjpeg_error_exit1( "Could not open for writing: %s", cur_filename ); + } ++ { ++ int flags; ++ ++ (void)fcntl(fileno(strm), F_GETFL, &flags); ++ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK); ++ } + } + + void +@@ -200,6 +214,14 @@ + { + mjpeg_error_exit1( "Unable to open file %s for reading.", bs_filename); + } ++ ++ { ++ int flags; ++ ++ (void)fcntl(fileno(fileh), F_GETFL, &flags); ++ (void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK); ++ } ++ + filename = strcpy( new char[strlen(bs_filename)+1], bs_filename ); |