a bit of mess because I was not sure if lack of .version or .tarball-version in thirdparty/pulseaudio-13 dir was responsible for rebuild failure. Probably .tarball-version, because just .version already in git ...
I was surprised my git add was not working, but it was simply due to file being already in git, so you probably can ignore patch 0005
From d80fcb830f6ad704a58b43314f73bf0382bd3aa1 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 15:14:40 +0000 Subject: [PATCH 7/7] Add .tarball-version to pulseaudio-13.0 --- thirdparty/pulseaudio-13.0/.tarball-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 thirdparty/pulseaudio-13.0/.tarball-version diff --git a/thirdparty/pulseaudio-13.0/.tarball-version b/thirdparty/pulseaudio-13.0/.tarball-version new file mode 100644 index 00000000..f0750610 --- /dev/null +++ b/thirdparty/pulseaudio-13.0/.tarball-version @@ -0,0 +1 @@ +13.0 -- 2.29.0
From dd5d741dce6a13e77f42c28aa874cb8107a5b80b Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 14:16:40 +0000 Subject: [PATCH 5/7] modify pulseaudio/.gitignore --- thirdparty/pulseaudio-13.0/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/thirdparty/pulseaudio-13.0/.gitignore b/thirdparty/pulseaudio-13.0/.gitignore index 82b22e4c..78bee094 100644 --- a/thirdparty/pulseaudio-13.0/.gitignore +++ b/thirdparty/pulseaudio-13.0/.gitignore @@ -1,5 +1,4 @@ .tarball-version -.version .*.swp ABOUT-NLS build* -- 2.29.0
From d461a4491a04f908f5b728035ab9766834efc2e8 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 14:25:30 +0000 Subject: [PATCH 6/7] Add .version to fix pulseaudio-13.0 rebuild --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 45de1ec3..f8fa8d6a 100755 --- a/configure +++ b/configure @@ -223,6 +223,7 @@ echo CONFIGURING PULSEAUDIO cd thirdparty/pulseaudio* && \ SNDFILE_PATH=`expr $TOPDIR/thirdparty/libsndfile*` && \ #./bootstrap.sh && \ +echo 13.0 > .version && \ autoreconf -fi && \ ./configure --disable-dbus --disable-x11 --without-caps LIBSNDFILE_LIBS="-L$SNDFILE_PATH/src/.libs/ -lsndfile" LIBSNDFILE_CFLAGS="-I$SNDFILE_PATH/src" --enable-static && \ cd ../.. -- 2.29.0
From 90472563038781bf859dab8da83d96bef58c76b1 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 11:09:43 +0000 Subject: [PATCH 3/7] Hacks in cinelerra/Makefile - more libs to link with may be reuse at least pulseaudio/flac from tree? --- cinelerra/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cinelerra/Makefile b/cinelerra/Makefile index 0d17ad31..5df75f28 100644 --- a/cinelerra/Makefile +++ b/cinelerra/Makefile @@ -436,6 +436,11 @@ LIBS += \ -ldl \ -lbz2 \ -llzma \ + -lasyncns \ + -lvorbis \ + -lFLAC \ + -lpulse \ + -lsystemd \ -lrt # -lfontconfig \ @@ -525,6 +530,7 @@ FFMPEG_CFLAGS := \ $(FFMPEG_CFLAGS) FFMPEG_LIBS := -lavformat -lavcodec -lavutil -lswresample +FFMPEG_LIBS += `pkg-config --libs vdpau` `pkg-config --libs libva-drm` `pkg-config --libs libva-x11` CFLAGS += -g CXXFLAGS := $(CFLAGS) -std=c++11 -- 2.29.0
From 35859fbf1273826851882edcab934ffbd2aa9740 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 11:11:15 +0000 Subject: [PATCH 4/7] Hack: disable filefork does not link on rosa 2016 --- cinelerra/file.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra/file.inc b/cinelerra/file.inc index e36344a3..ddffa25d 100644 --- a/cinelerra/file.inc +++ b/cinelerra/file.inc @@ -23,7 +23,7 @@ #include "language.h" -#define USE_FILEFORK +//#define USE_FILEFORK // support useless text to movie feature //#define USE_SCENE -- 2.29.0
From 7e3099709cfdb8c026b22e484a11ad7a01c8f17a Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 15 Feb 2024 11:05:48 +0000 Subject: [PATCH 2/7] Modify configure and quicktime/configure: add autoreconf -fi to faad/faac, libraw1394, pulseaudio disable vaapi/vdpau in ffmpeg --- configure | 4 +++- quicktime/configure | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e5d7a9d5..45de1ec3 100755 --- a/configure +++ b/configure @@ -141,7 +141,7 @@ FFMPEG_LFLAGS="-L$FFMPEG_DIR/libavformat -L$FFMPEG_DIR/libavcodec -L$FFMPEG_DIR/ FFMPEG_LIBS="-lavformat -lavcodec -lavutil -lswresample -ldl -lm -lpthread -lz -lbz2 -llzma" cd $FFMPEG_DIR -./configure --enable-pthreads --disable-ffplay --enable-nonfree --disable-doc --enable-gpl --nvccflags=-I$CUDA_DIR/include --extra-cflags=-I$CUDA_DIR/include --extra-ldflags=-L$CUDA_DIR/lib64 +./configure --enable-pthreads --disable-vaapi --disable-vdpau --disable-ffplay --enable-nonfree --disable-doc --enable-gpl --nvccflags=-I$CUDA_DIR/include --extra-cflags=-I$CUDA_DIR/include --extra-ldflags=-L$CUDA_DIR/lib64 if [ $? -ne 0 ]; then ERROR=1 fi @@ -223,6 +223,7 @@ echo CONFIGURING PULSEAUDIO cd thirdparty/pulseaudio* && \ SNDFILE_PATH=`expr $TOPDIR/thirdparty/libsndfile*` && \ #./bootstrap.sh && \ +autoreconf -fi && \ ./configure --disable-dbus --disable-x11 --without-caps LIBSNDFILE_LIBS="-L$SNDFILE_PATH/src/.libs/ -lsndfile" LIBSNDFILE_CFLAGS="-I$SNDFILE_PATH/src" --enable-static && \ cd ../.. @@ -233,6 +234,7 @@ if [ $? -ne 0 ]; then echo "Giving up and going to a movie."; exit 1; fi echo CONFIGURING RAW1394 cd thirdparty/libraw1394* && \ +autoreconf -fi && \ ./configure --enable-shared=no && \ ln -sf src libraw1394 && \ cd ../.. diff --git a/quicktime/configure b/quicktime/configure index 1cd11629..bdaef549 100755 --- a/quicktime/configure +++ b/quicktime/configure @@ -70,13 +70,13 @@ if [ $? -ne 0 ]; then echo "Giving up and going to a movie."; exit 1; fi LIBFAAD_PATH=`expr thirdparty/faad2*/` echo "CONFIGURING FAAD" -cd $LIBFAAD_PATH && ./configure && sed 's/ /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ../.. +cd $LIBFAAD_PATH && autoreconf -fi && ./configure && sed 's/ /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ../.. #cd $LIBFAAD_PATH && ./configure && cd ../.. if [ $? -ne 0 ]; then echo "Giving up and going to a movie."; exit 1; fi echo "CONFIGURING FAAC" -cd thirdparty/faac* && ./configure && cd ../.. +cd thirdparty/faac* && autoreconf -fi && ./configure && cd ../.. if [ $? -ne 0 ]; then echo "Giving up and going to a movie."; exit 1; fi -- 2.29.0
From cf2c8322b68f4dcf6c0ab7e1621506067e8a4c8f Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Tue, 25 Oct 2022 16:33:47 +0000 Subject: [PATCH 1/7] Fix file.c without USE_FILEFORK --- cinelerra/file.C | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/cinelerra/file.C b/cinelerra/file.C index 60e6658c..4359ac10 100644 --- a/cinelerra/file.C +++ b/cinelerra/file.C @@ -438,12 +438,12 @@ int File::open_file(Preferences *preferences, this->rd = rd; this->wr = wr; file = 0; - +#ifdef USE_FILEFORK if(debug) printf("File::open_file %d is_fork=%d path=%s\n", __LINE__, is_fork, asset->path); - +#endif #ifdef USE_FILEFORK if(!is_fork) { @@ -595,14 +595,14 @@ int File::open_file(Preferences *preferences, return result; // } } -#endif // USE_FILEFORK + if(debug) printf("File::open_file %d is_fork=%d format=%d\n", __LINE__, is_fork, this->asset->format); - +#endif // USE_FILEFORK if(this->asset->format == FILE_UNKNOWN) { // try to discover the format @@ -707,11 +707,12 @@ int File::open_file(Preferences *preferences, { asset->copy_from(this->asset, 1); } - +#ifdef USE_FILEFORK if(debug) printf("File::open_file %d is_fork=%d file=%p\n", __LINE__, is_fork, file); +#endif // sleep(1); if(file) @@ -731,6 +732,7 @@ int File::open_file(Preferences *preferences, // called by the fork to show a progress bar when building a table of contents void File::start_progress(const char *title, int64_t total) { +#ifdef USE_FILEFORK if(is_fork) { int data_len = sizeof(int64_t) + strlen(title) + 1; @@ -741,6 +743,7 @@ void File::start_progress(const char *title, int64_t total) return; } +#endif // show progress only if there's a GUI if(BC_WindowBase::get_resources()->initialized) { @@ -771,6 +774,7 @@ void File::start_progress(const char *title, int64_t total) void File::update_progress(int64_t value) { +#ifdef USE_FILEFORK if(is_fork) { file_fork->send_result(FileFork::UPDATE_PROGRESS, @@ -779,6 +783,7 @@ void File::update_progress(int64_t value) return; } +#endif if(MWindow::file_progress) { // MWindow::file_progress->update(value, 1); @@ -788,6 +793,7 @@ void File::update_progress(int64_t value) void File::update_progress_title(const char *title) { +#ifdef USE_FILEFORK if(is_fork) { file_fork->send_result(FileFork::UPDATE_PROGRESS_TITLE, @@ -796,6 +802,7 @@ void File::update_progress_title(const char *title) return; } +#endif if(MWindow::file_progress) { MWindow::file_progress->update_title(title, 1); @@ -807,6 +814,7 @@ void File::update_progress_title(const char *title) // returns 1 if the user cancelled int File::progress_canceled() { +#ifdef USE_FILEFORK if(is_fork) { file_fork->send_result(FileFork::PROGRESS_CANCELED, 0, 0); @@ -814,6 +822,7 @@ int File::progress_canceled() return file_fork->command_token; } +#endif if(MWindow::file_progress && MWindow::file_progress->is_cancelled()) { return 1; @@ -824,6 +833,7 @@ int File::progress_canceled() void File::stop_progress(const char *title) { +#ifdef USE_FILEFORK if(is_fork) { file_fork->send_result(FileFork::STOP_PROGRESS, @@ -831,7 +841,7 @@ void File::stop_progress(const char *title) strlen(title) + 1); return; } - +#endif if(MWindow::file_progress) { if(!MWindow::is_loading) @@ -2241,10 +2251,14 @@ VFrame* File::get_read_temp(int colormodel, int rowspan, int w, int h) params[1] = rowspan; params[2] = w; params[3] = h; +#ifdef USE_FILEFORK file_fork->send_result(FileFork::FILE_READ_TEMP, + (unsigned char*)¶ms, sizeof(params)); + int result = file_fork->read_command(1); + if(result >= 0) { // extract the frame buffer @@ -2255,9 +2269,10 @@ VFrame* File::get_read_temp(int colormodel, int rowspan, int w, int h) use_temp_frame = 1; return temp_frame; } - +#endif // failed return 0; + } // set pointers to where read_frame output is stored @@ -2349,7 +2364,11 @@ void File::convert_cmodel(int use_opengl, VDeviceX11 *device) } // only convert from the temp_frame in the server - if(use_temp_frame && !is_fork) + if(use_temp_frame +#ifdef uSE_FILEFORK + && !is_fork +#endif + ) { if(!use_opengl) { -- 2.29.0
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
