From 42e3082637998150a8dc0251c5b846f78e1d4772 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 14 Jun 2004 08:35:51 +0000 Subject: [PATCH] Portability modifications to scripts git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@329 d19143bc-622f-0410-bfdd-b5b2a6649095 --- configure | 7 ++++--- src/modules/configure | 9 +++++---- src/modules/core/configure | 2 +- src/modules/core/transition_composite.c | 3 ++- src/modules/dv/configure | 2 +- src/modules/fezzik/configure | 2 +- src/modules/gtk2/configure | 2 +- src/modules/inigo/configure | 2 +- src/modules/normalize/configure | 2 +- src/modules/resample/configure | 2 +- src/modules/sdl/configure | 2 +- src/modules/sdl/consumer_sdl.c | 8 ++++---- src/modules/sox/configure | 2 +- src/modules/vorbis/configure | 2 +- src/modules/westley/configure | 2 +- src/modules/xine/configure | 2 +- 16 files changed, 27 insertions(+), 24 deletions(-) diff --git a/configure b/configure index a5f0312..c238296 100755 --- a/configure +++ b/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh function show_help { @@ -120,10 +120,11 @@ do if [ -x src/$i/configure ] then [ $help = 0 ] && echo "Configuring `basename $i`:" - pushd src/$i > /dev/null + olddir=`pwd` + cd src/$i ./configure "$@" [ $? != 0 ] && exit 1 - popd > /dev/null + cd $olddir fi done diff --git a/src/modules/configure b/src/modules/configure index 6879efc..83b27c8 100755 --- a/src/modules/configure +++ b/src/modules/configure @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh # Clean up disables if not in help mode [ "$help" != "1" ] && rm -f disable-* producers.dat filters.dat transitions.dat consumers.dat # Create the make.inc file -echo SUBDIRS = `find -type d -maxdepth 1 | grep -v CVS | grep -v "^.$" | sed 's/\.\///'` > make.inc +echo SUBDIRS = `find . -type d -maxdepth 1 | grep -v CVS | grep -v "^.$" | sed 's/\.\///'` > make.inc # Iterate through arguments for i in "$@" @@ -22,10 +22,11 @@ do if [ "$gpl" = "true" -o ! -f $i/gpl ] then [ "$help" = "0" ] && echo "Configuring modules/$i:" - pushd $i > /dev/null + olddir2=`pwd` + cd $i ./configure "$@" [ $? != 0 ] && exit 1 - popd > /dev/null + cd $olddir2 elif [ "$help" = "0" ] then touch disable-$i diff --git a/src/modules/core/configure b/src/modules/core/configure index 9373d83..818fe24 100755 --- a/src/modules/core/configure +++ b/src/modules/core/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 88c1222..0119380 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -1033,7 +1033,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f int32_t luma_softness = mlt_properties_get_double( properties, "softness" ) * ( 1 << 16 ); uint16_t *luma_bitmap = get_luma( properties, width_b, height_b ); - composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL; + //composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL; + composite_line_fn line_fn = NULL; for ( field = 0; field < ( progressive ? 1 : 2 ); field++ ) { diff --git a/src/modules/dv/configure b/src/modules/dv/configure index 9453267..4825f84 100755 --- a/src/modules/dv/configure +++ b/src/modules/dv/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/fezzik/configure b/src/modules/fezzik/configure index b7880ad..c56f34c 100755 --- a/src/modules/fezzik/configure +++ b/src/modules/fezzik/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure index c0d1688..8979d12 100755 --- a/src/modules/gtk2/configure +++ b/src/modules/gtk2/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/inigo/configure b/src/modules/inigo/configure index 9b1808f..c98c930 100755 --- a/src/modules/inigo/configure +++ b/src/modules/inigo/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/normalize/configure b/src/modules/normalize/configure index c89aba5..d47e494 100755 --- a/src/modules/normalize/configure +++ b/src/modules/normalize/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/resample/configure b/src/modules/resample/configure index 7e0f23a..649195e 100755 --- a/src/modules/resample/configure +++ b/src/modules/resample/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/sdl/configure b/src/modules/sdl/configure index 1c40fac..e7572ca 100755 --- a/src/modules/sdl/configure +++ b/src/modules/sdl/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index eee6cdd..660169b 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -131,7 +131,7 @@ mlt_consumer consumer_sdl_init( char *arg ) this->height = mlt_properties_get_int( this->properties, "height" ); // Default window size - this->window_width = ( float )this->height * this->display_aspect + 0.5; + this->window_width = ( float )this->height * this->display_aspect; this->window_height = this->height; } else @@ -447,7 +447,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( this->rect.w > this->window_width ) { this->rect.w = this->window_width; - this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5; + this->rect.h = this_aspect / frame_aspect * this->window_height; } } } @@ -462,11 +462,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) else if ( this->window_height * this->display_aspect > this->window_width ) { this->rect.w = this->window_width; - this->rect.h = this->window_width / this->display_aspect + 0.5; + this->rect.h = this->window_width / this->display_aspect; } else { - this->rect.w = this->window_height * this->display_aspect + 0.5; + this->rect.w = this->window_height * this->display_aspect; this->rect.h = this->window_height; } diff --git a/src/modules/sox/configure b/src/modules/sox/configure index 1a3f61f..15aa439 100755 --- a/src/modules/sox/configure +++ b/src/modules/sox/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/vorbis/configure b/src/modules/vorbis/configure index 77f3155..bf06011 100755 --- a/src/modules/vorbis/configure +++ b/src/modules/vorbis/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/westley/configure b/src/modules/westley/configure index b971570..ac2e83f 100755 --- a/src/modules/westley/configure +++ b/src/modules/westley/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then diff --git a/src/modules/xine/configure b/src/modules/xine/configure index 022c9cd..3c04324 100755 --- a/src/modules/xine/configure +++ b/src/modules/xine/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ "$help" != "1" ] then -- 1.7.4.4