projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9afc384
)
version update, bld tweaks, resize track booby, 10fps for images
author
Good Guy
<
[email protected]
>
Fri, 1 Mar 2019 03:44:57 +0000
(20:44 -0700)
committer
Good Guy
<
[email protected]
>
Fri, 1 Mar 2019 03:44:57 +0000
(20:44 -0700)
cinelerra-5.1/blds/PKGBUILD
patch
|
blob
|
history
cinelerra-5.1/blds/cinelerra.spec
patch
|
blob
|
history
cinelerra-5.1/blds/debian/changelog
patch
|
blob
|
history
cinelerra-5.1/blds/debian/control
patch
|
blob
|
history
cinelerra-5.1/cinelerra/filegif.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/filelist.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/resizetrackthread.C
patch
|
blob
|
history
cinelerra-5.1/configure.ac
patch
|
blob
|
history
cinelerra-5.1/thirdparty/Makefile
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/blds/PKGBUILD
b/cinelerra-5.1/blds/PKGBUILD
index c1122712b4fca688e83b3fb2003aca47fbceb9bd..4c805b2fae69c792960279a9cee5ab5566d2836e 100644
(file)
--- a/
cinelerra-5.1/blds/PKGBUILD
+++ b/
cinelerra-5.1/blds/PKGBUILD
@@
-1,7
+1,7
@@
# Maintainer: goodguy <lists.cinelerra-gg.org>
pkgname=cin
pkgver=5.1
# Maintainer: goodguy <lists.cinelerra-gg.org>
pkgname=cin
pkgver=5.1
-pkgrel=20190
131
+pkgrel=20190
228
pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)"
arch=('x86_64')
url="https://www.cinelerra-gg.org"
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 bdbc400a9c4d3fa96ab11a4177604e8bf3769e60..bdeb516778efedb96fc85908e59623c9741883b6 100644
(file)
--- a/
cinelerra-5.1/blds/cinelerra.spec
+++ b/
cinelerra-5.1/blds/cinelerra.spec
@@
-1,4
+1,4
@@
-%define ver 20190
131
+%define ver 20190
228
%define cin cinelerra
Summary: Multimedia Editing and construction
%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 4afa68f57edbbacfa45be430d453becb5ad7387d..d130d9b6a0d9116d5b27fde147cb0f3e9162cb84 100644
(file)
--- a/
cinelerra-5.1/blds/debian/changelog
+++ b/
cinelerra-5.1/blds/debian/changelog
@@
-1,4
+1,4
@@
-cin (1:5.1.20190
131
) unstable; urgency=low
+cin (1:5.1.20190
228
) unstable; urgency=low
[ guy goode ]
[ guy goode ]
diff --git
a/cinelerra-5.1/blds/debian/control
b/cinelerra-5.1/blds/debian/control
index 822e36ee674333447ebb5e75d152313e0f629bb6..bdc83e4072c61fac6a86b5420da906f753dc51f9 100644
(file)
--- a/
cinelerra-5.1/blds/debian/control
+++ b/
cinelerra-5.1/blds/debian/control
@@
-1,7
+1,7
@@
Source: cin
Section: video
Priority: optional
Source: cin
Section: video
Priority: optional
-Standards-Version: 5.1.20190
131
+Standards-Version: 5.1.20190
228
Maintainer: mailing list <
[email protected]
>
Homepage: https://www.cinelerra-gg.org/
Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,
Maintainer: mailing list <
[email protected]
>
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 73c3d8e5bb31c17de6b0f53de75ccceac6e83502..6462fdca8af1a9e093a299e8f00ca0f82951d497 100644
(file)
--- 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 )
if( height ) asset->height = height;
asset->layers = 1;
if( !asset->frame_rate )
- asset->frame_rate = 1;
+ asset->frame_rate = 1
0
;
asset->video_data = 1;
row_size = gif_file->SWidth * sizeof(GifPixelType);
bg = (GifRowType)malloc(row_size);
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();
}
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;
}
return result;
}
diff --git
a/cinelerra-5.1/cinelerra/filelist.C
b/cinelerra-5.1/cinelerra/filelist.C
index ee287bc4ec2485af1d2f443e02970072a574d92a..f4f26dac22e9479c53b74881780180ad3d3c3dc9 100644
(file)
--- 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 )
if( height ) asset->height = height;
asset->layers = 1;
if( !asset->frame_rate )
- asset->frame_rate = 1;
+ asset->frame_rate = 1
0
;
}
}
else
}
}
else
diff --git
a/cinelerra-5.1/cinelerra/resizetrackthread.C
b/cinelerra-5.1/cinelerra/resizetrackthread.C
index f8e3de367561a23568d7089204a981b54cfd1d6b..b8368ff400d314caf865ddf1cfc97467649c9101 100644
(file)
--- 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;
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);
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)
}
ResizeAssetButton::ResizeAssetButton(AssetEditWindow *fwindow, int x, int y)
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index cc4f0fb4351f6877330fba9587aac58846cfe621..9305fe2c7d367c7f3e26677dc95fc7496f2e71a2 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-436,9
+436,9
@@
AC_DEFUN([REQUIRE_PROG], [
])
## arch dep tests
])
## 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.
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 47d6314f10bfabd3aea29934994b0ff55921f236..4fae862b801e8f9565f03d3e19de657d92b9eb94 100644
(file)
--- 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
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
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