move bld scripts to blds, add yuri GL bsd patch

[goodguy/history.git] / cinelerra-5.1 / blds / bsd.patch

diff --git a/cinelerra-5.1/bsd.patch b/cinelerra-5.1/blds/bsd.patch
similarity index 98%
rename from cinelerra-5.1/bsd.patch
rename to cinelerra-5.1/blds/bsd.patch
index f6841bdaf29a02c2c48f6144488c92abd8e6500a..31d18ba62bccc97451129f67c3a4aed6959f8b86 100644 (file)
--- a/cinelerra-5.1/bsd.patch
+++ b/cinelerra-5.1/blds/bsd.patch
@@ -1,5 +1,5 @@
 diff --git a/cinelerra-5.1/Makefile.devel b/cinelerra-5.1/Makefile.devel
 diff --git a/cinelerra-5.1/Makefile.devel b/cinelerra-5.1/Makefile.devel

-index a12d8f2b..f892f648 100644
+index a12d8f2b..9aac014a 100644

 --- a/cinelerra-5.1/Makefile.devel
 +++ b/cinelerra-5.1/Makefile.devel
 @@ -4,7 +4,7 @@ TOPDIR := $(CURDIR)
 --- a/cinelerra-5.1/Makefile.devel
 +++ b/cinelerra-5.1/Makefile.devel
 @@ -4,7 +4,7 @@ TOPDIR := $(CURDIR)


@@ -12,7 +12,7 @@ index a12d8f2b..f892f648 100644
  MAKEJ := $(MAKE) $(jobs)
  
 diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
  MAKEJ := $(MAKE) $(jobs)
  
 diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile

-index 18590e3a..a60c71d1 100644
+index 18590e3a..5eead290 100644

 --- a/cinelerra-5.1/cinelerra/Makefile
 +++ b/cinelerra-5.1/cinelerra/Makefile
 @@ -395,6 +395,7 @@ LIBS += -lfontconfig -lfreetype
 --- a/cinelerra-5.1/cinelerra/Makefile
 +++ b/cinelerra-5.1/cinelerra/Makefile
 @@ -395,6 +395,7 @@ LIBS += -lfontconfig -lfreetype


@@ -23,6 +23,15 @@ index 18590e3a..a60c71d1 100644
  
  LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3)
  LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC)
  
  LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3)
  LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC)

+@@ -414,7 +415,7 @@ LIBS += $(if $(filter x265,$(static_pkgs)), -lx265)
+ LIBS += $(if $(filter libvpx,$(static_pkgs)), -lvpx)
+ 
+ ifneq ($(WANT_GL),no)
+-LIBS += -lGL -lGLU -lGLX
++LIBS += -lGL -lGLU
+ endif
+ ifneq ($(WANT_XFT),no)
+ LIBS += -lXft

 @@ -476,6 +477,7 @@ LV2OBJS = \
  endif
  
 @@ -476,6 +477,7 @@ LV2OBJS = \
  endif
  


@@ -196,7 +205,7 @@ index 3d21d2af..f3064199 100644
  // check for isofs volume_id for dvd/cdrom
  
 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
  // check for isofs volume_id for dvd/cdrom
  
 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac

-index 6fba32bb..ccdb683b 100644
+index 94f9b382..4c4bee11 100644

 --- a/cinelerra-5.1/configure.ac
 +++ b/cinelerra-5.1/configure.ac
 @@ -16,15 +16,26 @@ CFG_CFLAGS+=" -Wno-unused-result"
 --- a/cinelerra-5.1/configure.ac
 +++ b/cinelerra-5.1/configure.ac
 @@ -16,15 +16,26 @@ CFG_CFLAGS+=" -Wno-unused-result"


@@ -281,7 +290,7 @@ index 40f5971f..73d47586 100644
        float* get_values();
  
 diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
        float* get_values();
  
 diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C

-index e3400600..b32d0a6f 100644
+index e3400600..f201028c 100644

 --- a/cinelerra-5.1/guicast/bcresources.C
 +++ b/cinelerra-5.1/guicast/bcresources.C
 @@ -38,6 +38,7 @@
 --- a/cinelerra-5.1/guicast/bcresources.C
 +++ b/cinelerra-5.1/guicast/bcresources.C
 @@ -38,6 +38,7 @@