From: Good Guy Date: Fri, 1 Mar 2019 03:44:57 +0000 (-0700) Subject: version update, bld tweaks, resize track booby, 10fps for images X-Git-Tag: 2019-08~92 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=cb1a1530246ad67fb9be9aa2dbba5b88eb63e933;p=goodguy%2Fcinelerra.git version update, bld tweaks, resize track booby, 10fps for images --- diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index c1122712..4c805b2f 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20190131 +pkgrel=20190228 pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="https://www.cinelerra-gg.org" diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index bdbc400a..bdeb5167 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20190131 +%define ver 20190228 %define cin cinelerra Summary: Multimedia Editing and construction diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog index 4afa68f5..d130d9b6 100644 --- a/cinelerra-5.1/blds/debian/changelog +++ b/cinelerra-5.1/blds/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20190131) unstable; urgency=low +cin (1:5.1.20190228) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index 822e36ee..bdc83e40 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20190131 +Standards-Version: 5.1.20190228 Maintainer: mailing list Homepage: https://www.cinelerra-gg.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/cinelerra/filegif.C b/cinelerra-5.1/cinelerra/filegif.C index 73c3d8e5..6462fdca 100644 --- a/cinelerra-5.1/cinelerra/filegif.C +++ b/cinelerra-5.1/cinelerra/filegif.C @@ -171,7 +171,7 @@ int FileGIF::open_gif() if( height ) asset->height = height; asset->layers = 1; if( !asset->frame_rate ) - asset->frame_rate = 1; + asset->frame_rate = 10; asset->video_data = 1; row_size = gif_file->SWidth * sizeof(GifPixelType); bg = (GifRowType)malloc(row_size); @@ -186,11 +186,6 @@ int FileGIF::open_gif() result = scan_gif(); asset->video_length = file_pos.size(); } - if( !result ) { - asset->video_data = 1; - if( !asset->frame_rate ) - asset->frame_rate = 10; - } return result; } diff --git a/cinelerra-5.1/cinelerra/filelist.C b/cinelerra-5.1/cinelerra/filelist.C index ee287bc4..f4f26dac 100644 --- a/cinelerra-5.1/cinelerra/filelist.C +++ b/cinelerra-5.1/cinelerra/filelist.C @@ -139,7 +139,7 @@ int FileList::open_file(int rd, int wr) if( height ) asset->height = height; asset->layers = 1; if( !asset->frame_rate ) - asset->frame_rate = 1; + asset->frame_rate = 10; } } else diff --git a/cinelerra-5.1/cinelerra/resizetrackthread.C b/cinelerra-5.1/cinelerra/resizetrackthread.C index f8e3de36..b8368ff4 100644 --- a/cinelerra-5.1/cinelerra/resizetrackthread.C +++ b/cinelerra-5.1/cinelerra/resizetrackthread.C @@ -329,10 +329,12 @@ void ResizeAssetThread::update() char string[BCTEXTLEN]; asset->width = w; asset->height = h; + fwindow->lock_window("ResizeAssetThread::update"); sprintf(string, "%d", asset->width); fwindow->win_width->update(string); sprintf(string, "%d", asset->height); fwindow->win_height->update(string); + fwindow->unlock_window(); } ResizeAssetButton::ResizeAssetButton(AssetEditWindow *fwindow, int x, int y) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index cc4f0fb4..9305fe2c 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -436,9 +436,9 @@ AC_DEFUN([REQUIRE_PROG], [ ]) ## arch dep tests -ARCH=`uname -m` -I86=`expr "x$ARCH" : 'xi[346]86.*'` -X86=`expr "x$ARCH" : 'x..._64*'` +ARCH=[`uname -m`] +I86=[`expr "x$ARCH" : 'xi[346]86.*'`] +X86=[`expr "x$ARCH" : 'x..._64*'`] if test "x$I86$X86" != "x00" ; then # Checks for ix86 programs. diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 47d6314f..4fae862b 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -178,9 +178,8 @@ libaom.cfg_vars?=$(call cmake_config,aom-master) libaom.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$(call bld_path,libaom)/usr/local libaom.mak_params?= ; $(MAKE) -C libaom* install -libwebp.cfg_vars?= ./autogen.sh ; -libwebp.cfg_params?=--enable-shared=no -libwebp.mak_params?=; $(MAKE) -C libwebp* install DESTDIR=$(call bld_path,libwebp) +libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) +libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp) mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)" mjpegtools.mak_params?=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools mjpegtools.cfg_params?= --enable-shared=no --without-libsdl --without-v4l