diff --git a/veejay-current/acconfig.h b/veejay-current/acconfig.h index 627a9e12..50dbbfdf 100644 --- a/veejay-current/acconfig.h +++ b/veejay-current/acconfig.h @@ -27,11 +27,10 @@ /* Define pthread lib stack size */ #undef HAVE_PTHREADSTACKSIZE -/* Define for an Intel based CPU */ -#undef HAVE_X86CPU /* For HAVEX86CPU: Define for availability of CMOV instruction (P6, P7 * and Athlon cores).*/ + #undef HAVE_CMOV /* For HAVEX86CPU: Define if the installed GCC tool chain can generate @@ -48,6 +47,8 @@ #undef HAVE_JACK +#undef HAVE_UNION_SEMUN + #undef HAVE_NCURSES /* For HAVEX86CPU: Define if the installed GCC tool-chain can generate diff --git a/veejay-current/configure b/veejay-current/configure index 1f52b239..e994405d 100755 --- a/veejay-current/configure +++ b/veejay-current/configure @@ -469,7 +469,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all ffmpeg/ffmpeg" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP EGREP LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LN_S RANLIB ac_ct_RANLIB ECHO LIBTOOL PRID64_STRING_FORMAT LIBGETOPT_LIB LIBOBJS POW_LIB LIBM_LIBS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS PTHREAD_LIBS JPEG_LIBS JPEG_CFLAGS DV_LIBS DV_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS x_libraries V4LCONF_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS XML2_CONFIG XML_CPPFLAGS XML_LIBS FREETYPE_CONFIG FT_LIBS FT_LDFLAGS FT_CFLAGS VEVO_CONFIG VEVO_CFLAGS VEVO_LIBS AS ASFLAGS HAVE_FREETYPE_TRUE HAVE_FREETYPE_FALSE HAVE_VEVO_TRUE HAVE_VEVO_FALSE BUILD_VEEJAY_TRUE BUILD_VEEJAY_FALSE HAVE_ASM_MMX_TRUE HAVE_ASM_MMX_FALSE HAVE_ASM_MMX2_TRUE HAVE_ASM_MMX2_FALSE HAVE_ASM_SSE_TRUE HAVE_ASM_SSE_FALSE HAVE_ASM_NASM_TRUE HAVE_ASM_NASM_FALSE HAVE_ASM_CMOV_TRUE HAVE_ASM_CMOV_FALSE HAVE_X86CPU_TRUE HAVE_X86CPU_FALSE ARCH_X86_TRUE ARCH_X86_FALSE HAVE_PPCCPU_TRUE HAVE_PPCCPU_FALSE HAVE_MIPS_TRUE HAVE_MIPS_FALSE HAVE_SDL_TRUE HAVE_SDL_FALSE HAVE_XML2_TRUE HAVE_XML2_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE HAVE_JACK_TRUE HAVE_JACK_FALSE HAVE_SAMPLERATE_TRUE HAVE_SAMPLERATE_FALSE ARCH_PPC_TRUE ARCH_PPC_FALSE CAN_COMPILE_C_ALTIVEC_TRUE CAN_COMPILE_C_ALTIVEC_FALSE LIBDV_PRE_0_9_9_TRUE LIBDV_PRE_0_9_9_FALSE HAVE_MMX_TRUE HAVE_MMX_FALSE SYSTEM_DARWIN_TRUE SYSTEM_DARWIN_FALSE HAVE_PPC_ALTIVEC_TRUE HAVE_PPC_ALTIVEC_FALSE WHAT subdirs LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP EGREP LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LN_S RANLIB ac_ct_RANLIB ECHO LIBTOOL PRID64_STRING_FORMAT LIBGETOPT_LIB LIBOBJS POW_LIB LIBM_LIBS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS PTHREAD_LIBS JPEG_LIBS JPEG_CFLAGS DV_LIBS DV_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS x_libraries V4LCONF_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS XML2_CONFIG XML_CPPFLAGS XML_LIBS FREETYPE_CONFIG FT_LIBS FT_LDFLAGS FT_CFLAGS VEVO_CONFIG VEVO_CFLAGS VEVO_LIBS AS ASFLAGS HAVE_FREETYPE_TRUE HAVE_FREETYPE_FALSE HAVE_VEVO_TRUE HAVE_VEVO_FALSE BUILD_VEEJAY_TRUE BUILD_VEEJAY_FALSE HAVE_ASM_MMX_TRUE HAVE_ASM_MMX_FALSE HAVE_ASM_MMX2_TRUE HAVE_ASM_MMX2_FALSE HAVE_ASM_SSE_TRUE HAVE_ASM_SSE_FALSE HAVE_ASM_NASM_TRUE HAVE_ASM_NASM_FALSE HAVE_ASM_CMOV_TRUE HAVE_ASM_CMOV_FALSE HAVE_X86CPU_TRUE HAVE_X86CPU_FALSE ARCH_X86_TRUE ARCH_X86_FALSE HAVE_PPCCPU_TRUE HAVE_PPCCPU_FALSE HAVE_MIPS_TRUE HAVE_MIPS_FALSE HAVE_UNION_SEMUN_TRUE HAVE_UNION_SEMUN_FALSE HAVE_SDL_TRUE HAVE_SDL_FALSE HAVE_XML2_TRUE HAVE_XML2_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE HAVE_JACK_TRUE HAVE_JACK_FALSE HAVE_SAMPLERATE_TRUE HAVE_SAMPLERATE_FALSE ARCH_PPC_TRUE ARCH_PPC_FALSE CAN_COMPILE_C_ALTIVEC_TRUE CAN_COMPILE_C_ALTIVEC_FALSE LIBDV_PRE_0_9_9_TRUE LIBDV_PRE_0_9_9_FALSE HAVE_MMX_TRUE HAVE_MMX_FALSE SYSTEM_DARWIN_TRUE SYSTEM_DARWIN_FALSE HAVE_PPC_ALTIVEC_TRUE HAVE_PPC_ALTIVEC_FALSE WHAT subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4884,6 +4884,7 @@ have_cmov=false have_asm_3dnow=false have_asm_mmx2=false have_x86cpu=false +have_union_semun=false have_mips=false have_ppccpu=false have_ppc_altivec=false @@ -6258,7 +6259,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 6261 "configure"' > conftest.$ac_ext + echo '#line 6262 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6787,7 +6788,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:6790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:6791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -8619,7 +8620,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +union semun foo; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + have_semun=true +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +have_semun=false +fi +rm -f conftest.$ac_objext conftest.$ac_ext +if test x$have_semun = xtrue +then + cat >>confdefs.h <<\_ACEOF +#define HAVE_UNION_SEMUN 1 +_ACEOF + +fi + + if test x$have_freetype = xtrue; then @@ -21520,6 +21568,16 @@ fi +if test x$have_semun = xtrue; then + HAVE_UNION_SEMUN_TRUE= + HAVE_UNION_SEMUN_FALSE='#' +else + HAVE_UNION_SEMUN_TRUE='#' + HAVE_UNION_SEMUN_FALSE= +fi + + + if test x$have_sdl = xtrue; then HAVE_SDL_TRUE= HAVE_SDL_FALSE='#' @@ -21944,6 +22002,13 @@ echo "$as_me: error: conditional \"HAVE_MIPS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_UNION_SEMUN_TRUE}" && test -z "${HAVE_UNION_SEMUN_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_UNION_SEMUN\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_UNION_SEMUN\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_SDL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -22715,6 +22780,8 @@ s,@HAVE_PPCCPU_TRUE@,$HAVE_PPCCPU_TRUE,;t t s,@HAVE_PPCCPU_FALSE@,$HAVE_PPCCPU_FALSE,;t t s,@HAVE_MIPS_TRUE@,$HAVE_MIPS_TRUE,;t t s,@HAVE_MIPS_FALSE@,$HAVE_MIPS_FALSE,;t t +s,@HAVE_UNION_SEMUN_TRUE@,$HAVE_UNION_SEMUN_TRUE,;t t +s,@HAVE_UNION_SEMUN_FALSE@,$HAVE_UNION_SEMUN_FALSE,;t t s,@HAVE_SDL_TRUE@,$HAVE_SDL_TRUE,;t t s,@HAVE_SDL_FALSE@,$HAVE_SDL_FALSE,;t t s,@HAVE_XML2_TRUE@,$HAVE_XML2_TRUE,;t t diff --git a/veejay-current/configure.in b/veejay-current/configure.in index 70394ef9..0b9900ea 100644 --- a/veejay-current/configure.in +++ b/veejay-current/configure.in @@ -90,6 +90,7 @@ have_cmov=false have_asm_3dnow=false have_asm_mmx2=false have_x86cpu=false +have_union_semun=false have_mips=false have_ppccpu=false have_ppc_altivec=false @@ -818,6 +819,15 @@ else have_cmov=false fi +AC_TRY_COMPILE([#include +#include +#include ],[union semun foo;], [have_semun=true],[have_semun=false]) +if test x$have_semun = xtrue +then + AC_DEFINE(HAVE_UNION_SEMUN,1) +fi + + dnl ********************************************************************** dnl All the conditional stuff for the Makefiles dnl @@ -833,6 +843,7 @@ AM_CONDITIONAL(HAVE_X86CPU, test x$have_x86cpu = xtrue) AM_CONDITIONAL(ARCH_X86, test x$have_x86cpu = xtrue) AM_CONDITIONAL(HAVE_PPCCPU, test x$have_ppccpu = xtrue) AM_CONDITIONAL(HAVE_MIPS, test x$have_mips = xtrue) +AM_CONDITIONAL(HAVE_UNION_SEMUN, test x$have_semun = xtrue) AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue) AM_CONDITIONAL(HAVE_XML2, test x$have_xml2 = xtrue) AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) diff --git a/veejay-current/libOSC/OSC-common.c b/veejay-current/libOSC/OSC-common.c index 1a72eec6..f24b1379 100644 --- a/veejay-current/libOSC/OSC-common.c +++ b/veejay-current/libOSC/OSC-common.c @@ -52,9 +52,11 @@ The OpenSound Control WWW page is #include #include #include +#include +#include +#include #include #include -#include void fatal_error(char *s, ...) { va_list ap; diff --git a/veejay-current/libOSC/OSC-drop.c b/veejay-current/libOSC/OSC-drop.c index ed3fe96b..88585ac7 100644 --- a/veejay-current/libOSC/OSC-drop.c +++ b/veejay-current/libOSC/OSC-drop.c @@ -33,10 +33,10 @@ The OpenSound Control WWW page is Matt Wright, 3/16/98 */ -#include -#include #include +#include #include +#include #include #include #include diff --git a/veejay-current/libel/avilib.c b/veejay-current/libel/avilib.c index 0db9f5fc..b99caf7f 100644 --- a/veejay-current/libel/avilib.c +++ b/veejay-current/libel/avilib.c @@ -24,9 +24,11 @@ */ #include +#include +#include +#include #include #include -#include #include #include #include diff --git a/veejay-current/libel/vj-mmap.c b/veejay-current/libel/vj-mmap.c index da5768dd..1c938b16 100644 --- a/veejay-current/libel/vj-mmap.c +++ b/veejay-current/libel/vj-mmap.c @@ -23,7 +23,7 @@ #include #include #include -#include +//#include #include #define PADDED(a,m) ( a > 0 ? (a / m->page_size) * m->page_size : 0) diff --git a/veejay-current/libel/vj-mmap.h b/veejay-current/libel/vj-mmap.h index bb215667..ffe46687 100644 --- a/veejay-current/libel/vj-mmap.h +++ b/veejay-current/libel/vj-mmap.h @@ -18,6 +18,7 @@ */ #ifndef VJ_MMAP_H #define VJ_MMAP_H +#include #include #include typedef struct diff --git a/veejay-current/libstream/vj-shm.h b/veejay-current/libstream/vj-shm.h index 891b2a1e..a254d9cb 100644 --- a/veejay-current/libstream/vj-shm.h +++ b/veejay-current/libstream/vj-shm.h @@ -19,8 +19,12 @@ #ifndef VJ_SHM #define VJ_SHM #include +#include #include #include + +#ifndef HAVE_UNION_SEMUN +#define HAVE_UNION_SEMUN union semun { int val; @@ -28,7 +32,7 @@ union semun unsigned short *array; struct seminfo *__buf; }; - +#endif typedef struct video_segment_t diff --git a/veejay-current/libstream/vj-tag.c b/veejay-current/libstream/vj-tag.c index bc6ddc08..429f73a6 100644 --- a/veejay-current/libstream/vj-tag.c +++ b/veejay-current/libstream/vj-tag.c @@ -31,7 +31,11 @@ #ifdef HAVE_V4L #include #include +#else +#define VIDEO_PALETTE_YUV420P 15 +#define VIDEO_PALETTE_YUV422P 13 #endif + #ifdef SUPPORT_READ_DV2 #include #endif @@ -353,7 +357,7 @@ int _vj_tag_new_dv1394(vj_tag *tag, int stream_nr, int channel,int quality, edit if(vj_tag_input->dv1394[stream_nr]) { veejay_msg(VEEJAY_MSG_INFO, "DV1394 ready for capture"); - vj_dv_decoder_set_audio( vj_tag_input->dv1394[stream_nr], el->has_audio); +// vj_dv_decoder_set_audio( vj_tag_input->dv1394[stream_nr], el->has_audio); return 1; } return 0; diff --git a/veejay-current/libstream/vj-tag.h b/veejay-current/libstream/vj-tag.h index d1dea181..bce044bb 100644 --- a/veejay-current/libstream/vj-tag.h +++ b/veejay-current/libstream/vj-tag.h @@ -41,13 +41,17 @@ #include #include #include +#ifdef HAVE_V4L #include +#endif #include #include #include typedef struct { +#ifdef HAVE_V4L v4l_video *v4l[VJ_TAG_MAX_V4L]; +#endif vj_yuv *stream[VJ_TAG_MAX_STREAM_IN]; vj_avformat *avformat[VJ_TAG_MAX_STREAM_IN]; vj_client *net[VJ_TAG_MAX_STREAM_IN]; @@ -130,9 +134,9 @@ int vj_tag_get_effect(int t1, int position); int vj_tag_size(); vj_tag *vj_tag_get(int id); - +#ifdef HAVE_V4L int _vj_tag_new_v4l(vj_tag *t, int nr , int w , int h, int n, int p, int f, int chan); - +#endif /* always return effect (-1 = empty) */ int vj_tag_get_effect_any(int t1, int position); diff --git a/veejay-current/libvjnet/cmd.h b/veejay-current/libvjnet/cmd.h index 8a145242..956ffde8 100644 --- a/veejay-current/libvjnet/cmd.h +++ b/veejay-current/libvjnet/cmd.h @@ -19,8 +19,9 @@ */ #ifndef CMD_H_INCLUDED #define CMD_H_INCLUDED -#include +#include #include +#include #include #include typedef struct diff --git a/veejay-current/libyuv/subsample.c b/veejay-current/libyuv/subsample.c index 811cd095..ed80bcd5 100644 --- a/veejay-current/libyuv/subsample.c +++ b/veejay-current/libyuv/subsample.c @@ -563,8 +563,8 @@ static void tr_422_to_444(uint8_t *buffer, int width, int height) #else for(x=0; x < stride; x++) // for 1 row { - dst[0] = row[x]; //put to dst - dst[1] = row[x]; + dst[0] = src[x]; //put to dst + dst[1] = src[x]; dst+=2; // increment dst } #endif