upgrade libx265 to 3.1.2, tweak menupopup placement

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index e31cb108eb3a6d1c1b3b49457a15244bc704cb22..a60bb1103de17a6df4cfcf79e588b0dfcaf3acb5 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -368,7 +368,7 @@ PKG_3RD([x264],[auto],
   [ . ])
 
 PKG_3RD([x265],[auto],
   [ . ])
 
 PKG_3RD([x265],[auto],

-  [x265_3.0],
+  [x265_3.1.2],

   [ libx265.a ],
   [ . source ])
 
   [ libx265.a ],
   [ . source ])
 

diff --git a/cinelerra-5.1/guicast/bcmenupopup.C b/cinelerra-5.1/guicast/bcmenupopup.C
index c47e699a4be00cb8fe89bb555231568271605bb7..6c4f5fe82dfc137857b6ea1fd9a95418fbf4743a 100644 (file)
--- a/cinelerra-5.1/guicast/bcmenupopup.C
+++ b/cinelerra-5.1/guicast/bcmenupopup.C
@@ -406,11 +406,11 @@ int BC_MenuPopup::get_dimensions()
                menu_items.values[i]->down = 0;
                h += menu_items.values[i]->h;
        }
                menu_items.values[i]->down = 0;
                h += menu_items.values[i]->h;
        }

-       w = widest_text + widest_key + 10;
+       w = widest_text + widest_key + 20;

 
        w = MAX(w, top_level->get_resources()->min_menu_w);
 // pad for division
 
        w = MAX(w, top_level->get_resources()->min_menu_w);
 // pad for division

-       key_x = widest_text + 5;
+       key_x = widest_text + 16;

 // pad for border
        h += 2;
        return 0;
 // pad for border
        h += 2;
        return 0;

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 11df06ed211d16cbc4bbd574f6b3d2ebefa1b452..142cc17ce356b9b5bc1f6fb226caf47c7f06055f 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -29,7 +29,7 @@ https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3
 https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
 ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20190131-2245-stable.tar.bz2
 https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
 ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20190131-2245-stable.tar.bz2

-https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz
+https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.2.tar.gz

 https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz
 https://code.videolan.org/videolan/dav1d/-/archive/0.4.0/dav1d-0.4.0.tar.gz
 https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz
 https://code.videolan.org/videolan/dav1d/-/archive/0.4.0/dav1d-0.4.0.tar.gz

diff --git a/cinelerra-5.1/thirdparty/src/x265_3.0.tar.xz b/cinelerra-5.1/thirdparty/src/x265_3.0.tar.xz
deleted file mode 100644 (file)
index cc68b10..0000000
Binary files a/cinelerra-5.1/thirdparty/src/x265_3.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/x265_3.1.2.tar.xz b/cinelerra-5.1/thirdparty/src/x265_3.1.2.tar.xz
new file mode 100644 (file)
index 0000000..3bd59f8
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x265_3.1.2.tar.xz differ