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:
18fbb2f
)
a few more bsd building mods from Andrew
author
Good Guy
<good1.2guy@gmail.com>
Mon, 16 May 2022 22:40:52 +0000
(16:40 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Mon, 16 May 2022 22:40:52 +0000
(16:40 -0600)
cinelerra-5.1/blds/bsd.bld
patch
|
blob
|
history
cinelerra-5.1/cinelerra/commercials.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/dbwindow.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/mediadb.h
patch
|
blob
|
history
cinelerra-5.1/db/tdb.h
patch
|
blob
|
history
cinelerra-5.1/plugins/Makefile
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/blds/bsd.bld
b/cinelerra-5.1/blds/bsd.bld
index b6ec27b30cae187affee7d44aa832180c93ffa65..3a6c024c90719efd708fedb67e32b3974c1682bd 100755
(executable)
--- a/
cinelerra-5.1/blds/bsd.bld
+++ b/
cinelerra-5.1/blds/bsd.bld
@@
-9,11
+9,11
@@
alias make=gmake
( ./autogen.sh
BSD=1 CC=clang CXX=clang++ CFLAGS="-g -O2 " \
./configure --with-single-user \
( ./autogen.sh
BSD=1 CC=clang CXX=clang++ CFLAGS="-g -O2 " \
./configure --with-single-user \
- --disable-static-build --without-l
v2
--disable-lame --disable-twolame \
+ --disable-static-build --without-l
ibzmpeg
--disable-lame --disable-twolame \
--with-oss --without-alsa --without-firewire --without-dv --without-dvb \
--without-video4linux2 --without-xxf86vm --without-ladspa-build \
--with-oss --without-alsa --without-firewire --without-dv --without-dvb \
--without-video4linux2 --without-xxf86vm --without-ladspa-build \
- --without-
libzmpeg --without-
commercial --without-thirdparty \
- --without-
vaapi --without-vdpau --without-shuttle
--without-shuttle-usb \
+ --without-commercial --without-thirdparty \
+ --without-
shuttle --without-libdpx
--without-shuttle-usb \
--without-x10tv --with-jobs=4 --without-wintv
gmake
gmake install ) 2>&1 | tee log
--without-x10tv --with-jobs=4 --without-wintv
gmake
gmake install ) 2>&1 | tee log
diff --git
a/cinelerra-5.1/cinelerra/commercials.h
b/cinelerra-5.1/cinelerra/commercials.h
index 443cf6c7236996846974f593e871c1863d9906c8..9fc8df5dd09f88fb9bd8da49da8096603202be2a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/commercials.h
+++ b/
cinelerra-5.1/cinelerra/commercials.h
@@
-1,4
+1,5
@@
#if defined(__i386__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
+#if defined (__linux__)
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
@@
-203,4
+204,5
@@
public:
#endif
#endif
+#endif // linux
#endif /* x86 */
\ No newline at end of file
#endif /* x86 */
\ No newline at end of file
diff --git
a/cinelerra-5.1/cinelerra/dbwindow.h
b/cinelerra-5.1/cinelerra/dbwindow.h
index 103beb6d927fbc8cef4b10d0871414027f0d2078..aadbfb07ed0da81de5e7ecbd83f62c52bae2163d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/dbwindow.h
+++ b/
cinelerra-5.1/cinelerra/dbwindow.h
@@
-1,4
+1,5
@@
#if defined(__i386__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
+#if defined (__linux__)
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
@@
-297,4
+298,5
@@
public:
#endif
#endif
+#endif // linux
#endif /* x86 */
\ No newline at end of file
#endif /* x86 */
\ No newline at end of file
diff --git
a/cinelerra-5.1/cinelerra/mediadb.h
b/cinelerra-5.1/cinelerra/mediadb.h
index f55cc6b0ce699dbbf60b1af601f02187486081d7..3b816c4ed55a01f69b6de0ba487a7aefc67e4bc1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mediadb.h
+++ b/
cinelerra-5.1/cinelerra/mediadb.h
@@
-1,4
+1,5
@@
#if defined(__i386__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
+#if defined (__linux__)
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
@@
-240,4
+241,5
@@
public:
};
#endif
};
#endif
+#endif // linux
#endif /* x86 */
\ No newline at end of file
#endif /* x86 */
\ No newline at end of file
diff --git
a/cinelerra-5.1/db/tdb.h
b/cinelerra-5.1/db/tdb.h
index 24c8617c59c33e78ee404d0006d84240ab712ed3..b746b640bf736060abfc49ae1845137b9b11ff69 100644
(file)
--- a/
cinelerra-5.1/db/tdb.h
+++ b/
cinelerra-5.1/db/tdb.h
@@
-1,4
+1,5
@@
#if defined(__i386__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
+#if defined (__linux__)
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
@@
-1515,4
+1516,5
@@
public:
};
#endif
};
#endif
+#endif // linux
#endif /* x86 */
\ No newline at end of file
#endif /* x86 */
\ No newline at end of file
diff --git
a/cinelerra-5.1/plugins/Makefile
b/cinelerra-5.1/plugins/Makefile
index e6718432975fa57d578748b4108483cdf21ee0f4..227faf808320d7942163c37623abb90bf5e3b1bb 100644
(file)
--- a/
cinelerra-5.1/plugins/Makefile
+++ b/
cinelerra-5.1/plugins/Makefile
@@
-160,9
+160,7
@@
DIRS = $(OPENCV_OBJS) \
yuvshift \
zoom \
zoomblur \
yuvshift \
zoom \
zoomblur \
- theme_blond \
theme_blond_cv \
theme_blond_cv \
- theme_blue \
theme_blue_dot \
theme_bright \
theme_hulk \
theme_blue_dot \
theme_bright \
theme_hulk \
@@
-174,7
+172,7
@@
DIRS = $(OPENCV_OBJS) \
PLATFORM = $(shell uname -o)
ifneq ($(PLATFORM), FreeBSD)
PLATFORM = $(shell uname -o)
ifneq ($(PLATFORM), FreeBSD)
-DIRS += cdripper
+DIRS += cdripper
theme_blond theme_blue
endif
# not maintained
endif
# not maintained