diff options
26 files changed, 640 insertions, 21 deletions
diff --git a/packages/busybox/busybox-1.9.2/topmem.patch b/packages/busybox/busybox-1.9.2/topmem.patch new file mode 100644 index 0000000000..d49bf58103 --- /dev/null +++ b/packages/busybox/busybox-1.9.2/topmem.patch @@ -0,0 +1,28 @@ +Index: busybox-1.9.2/procps/top.c +=================================================================== +--- busybox-1.9.2.orig/procps/top.c 2008-08-21 16:19:31.004137057 +0200 ++++ busybox-1.9.2/procps/top.c 2008-08-21 16:21:46.066805448 +0200 +@@ -909,17 +909,22 @@ + #else + qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); + #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ +- } else { /* TOPMEM */ ++ } ++#if ENABLE_FEATURE_TOPMEM ++ else { /* TOPMEM */ + qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); + } ++#endif + count = lines; + if (OPT_BATCH_MODE || count > ntop) { + count = ntop; + } + if (scan_mask == TOP_MASK) + display_process_list(count, col); ++#if ENABLE_FEATURE_TOPMEM + else + display_topmem_process_list(count, col); ++#endif + clearmems(); + if (iterations >= 0 && !--iterations) + break; diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index 37cd2a86be..e5c0f2473c 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \ + file://topmem.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc index f1f29710a3..afbc395230 100644 --- a/packages/gcc/gcc-4.3.1.inc +++ b/packages/gcc/gcc-4.3.1.inc @@ -60,6 +60,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ + file://gcc-flags-for-build.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/packages/gcc/gcc-4.3.1/gcc-flags-for-build.patch b/packages/gcc/gcc-4.3.1/gcc-flags-for-build.patch new file mode 100644 index 0000000000..b9b17640ba --- /dev/null +++ b/packages/gcc/gcc-4.3.1/gcc-flags-for-build.patch @@ -0,0 +1,179 @@ +Index: gcc-4.3.1/Makefile.def +=================================================================== +--- gcc-4.3.1.orig/Makefile.def 2008-08-21 00:42:54.000000000 -0700 ++++ gcc-4.3.1/Makefile.def 2008-08-21 00:42:55.000000000 -0700 +@@ -207,6 +207,7 @@ + flags_to_pass = { flag= BISON ; }; + flags_to_pass = { flag= CC_FOR_BUILD ; }; + flags_to_pass = { flag= CFLAGS_FOR_BUILD ; }; ++flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; }; + flags_to_pass = { flag= CXX_FOR_BUILD ; }; + flags_to_pass = { flag= EXPECT ; }; + flags_to_pass = { flag= FLEX ; }; +Index: gcc-4.3.1/gcc/Makefile.in +=================================================================== +--- gcc-4.3.1.orig/gcc/Makefile.in 2008-08-21 00:42:54.000000000 -0700 ++++ gcc-4.3.1/gcc/Makefile.in 2008-08-21 00:42:55.000000000 -0700 +@@ -674,7 +674,7 @@ + + # Native linker and preprocessor flags. For x-fragment overrides. + BUILD_LDFLAGS=@BUILD_LDFLAGS@ +-BUILD_CPPFLAGS=$(ALL_CPPFLAGS) ++BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS) + + # Actual name to use when installing a native compiler. + GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') +Index: gcc-4.3.1/gcc/configure.ac +=================================================================== +--- gcc-4.3.1.orig/gcc/configure.ac 2008-08-21 00:42:54.000000000 -0700 ++++ gcc-4.3.1/gcc/configure.ac 2008-08-21 00:42:55.000000000 -0700 +@@ -1775,10 +1775,11 @@ + # Also, we cannot run fixincludes or fix-header. + + # These are the normal (build=host) settings: +-CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD) +-BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS) +-BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS) +-STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC) ++CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD) ++BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS) ++BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS) ++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)' AC_SUBST(BUILD_CPPFLAGS) ++STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC) + + # Possibly disable fixproto, on a per-target basis. + case ${use_fixproto} in +@@ -1796,6 +1797,7 @@ + then + BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' ++ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' + + if test "x$TARGET_SYSTEM_ROOT" = x; then + if test "x$STMP_FIXPROTO" != x; then +Index: gcc-4.3.1/Makefile.in +=================================================================== +--- gcc-4.3.1.orig/Makefile.in 2008-08-21 00:42:55.000000000 -0700 ++++ gcc-4.3.1/Makefile.in 2008-08-21 00:42:55.000000000 -0700 +@@ -272,6 +272,7 @@ + AS_FOR_BUILD = @AS_FOR_BUILD@ + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ + CXX_FOR_BUILD = @CXX_FOR_BUILD@ + DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ +@@ -501,6 +502,7 @@ + "BISON=$(BISON)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ ++ "CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \ + "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ + "EXPECT=$(EXPECT)" \ + "FLEX=$(FLEX)" \ +Index: gcc-4.3.1/gcc/configure +=================================================================== +--- gcc-4.3.1.orig/gcc/configure 2008-08-21 00:42:54.000000000 -0700 ++++ gcc-4.3.1/gcc/configure 2008-08-21 00:42:55.000000000 -0700 +@@ -309,7 +309,7 @@ + # include <unistd.h> + #endif" + +-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 target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS 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 target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' + ac_subst_files='language_hooks' + + # Initialize some variables set by options. +@@ -13312,6 +13312,7 @@ + CC_FOR_BUILD='$(CC)' + BUILD_CFLAGS='$(ALL_CFLAGS)' + BUILD_LDFLAGS='$(LDFLAGS)' ++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)' + STMP_FIXINC=stmp-fixinc + + # Possibly disable fixproto, on a per-target basis. +@@ -13330,6 +13331,7 @@ + then + BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' ++ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' + + if test "x$TARGET_SYSTEM_ROOT" = x; then + if test "x$STMP_FIXPROTO" != x; then +@@ -17961,6 +17963,7 @@ + s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t + s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t + s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t ++s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t + s,@STMP_FIXINC@,$STMP_FIXINC,;t t + s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t + s,@collect2@,$collect2,;t t +Index: gcc-4.3.1/Makefile.tpl +=================================================================== +--- gcc-4.3.1.orig/Makefile.tpl 2008-08-21 00:42:55.000000000 -0700 ++++ gcc-4.3.1/Makefile.tpl 2008-08-21 00:42:55.000000000 -0700 +@@ -275,6 +275,7 @@ + AS_FOR_BUILD = @AS_FOR_BUILD@ + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ + CXX_FOR_BUILD = @CXX_FOR_BUILD@ + DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ +Index: gcc-4.3.1/configure +=================================================================== +--- gcc-4.3.1.orig/configure 2008-08-21 01:29:03.000000000 -0700 ++++ gcc-4.3.1/configure 2008-08-21 01:29:14.000000000 -0700 +@@ -272,7 +272,7 @@ + PACKAGE_BUGREPORT= + + ac_unique_file="move-if-change" +-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 build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS 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 build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS' + ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag' + + # Initialize some variables set by options. +@@ -5914,6 +5914,7 @@ + # our build compiler if desired. + if test x"${build}" = x"${host}" ; then + CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} + CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} + LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} + fi +@@ -5991,6 +5992,7 @@ + + + ++ + # Generate default definitions for YACC, M4, LEX and other programs that run + # on the build machine. These are used if the Makefile can't locate these + # programs in objdir. +@@ -12874,6 +12876,7 @@ + s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t + s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t + s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t ++s,@CPPFLAGS_FOR_BUILD@,$CPPFLAGS_FOR_BUILD,;t t + s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t + s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t + s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t +Index: gcc-4.3.1/configure.ac +=================================================================== +--- gcc-4.3.1.orig/configure.ac 2008-08-21 01:27:06.000000000 -0700 ++++ gcc-4.3.1/configure.ac 2008-08-21 01:28:41.000000000 -0700 +@@ -2425,6 +2425,7 @@ + # our build compiler if desired. + if test x"${build}" = x"${host}" ; then + CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} + CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} + LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} + fi +@@ -2489,6 +2490,7 @@ + AC_SUBST(AS_FOR_BUILD) + AC_SUBST(CC_FOR_BUILD) + AC_SUBST(CFLAGS_FOR_BUILD) ++AC_SUBST(CPPFLAGS_FOR_BUILD) + AC_SUBST(CXXFLAGS_FOR_BUILD) + AC_SUBST(CXX_FOR_BUILD) + AC_SUBST(DLLTOOL_FOR_BUILD) diff --git a/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch index ec6e0af937..a7722cbfc4 100644 --- a/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch +++ b/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch @@ -14,3 +14,15 @@ Index: gcc-4.3.1/Makefile.in CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +Index: gcc-4.3.1/Makefile.tpl +=================================================================== +--- gcc-4.3.1.orig/Makefile.tpl 2008-08-21 00:07:58.000000000 -0700 ++++ gcc-4.3.1/Makefile.tpl 2008-08-21 00:09:52.000000000 -0700 +@@ -223,6 +223,7 @@ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ ++ CPP="$(CC_FOR_TARGET) -E"; export CPP; \ + CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb index 297bd8ece8..a326263c06 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" inherit sdk diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb index eeac86baa1..24d628d7cb 100644 --- a/packages/gcc/gcc-cross_4.3.1.bb +++ b/packages/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb index e8d84eb811..abbde9ade4 100644 --- a/packages/gcc/gcc_4.3.1.bb +++ b/packages/gcc/gcc_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index a4a44ae058..2f2645a125 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -1,7 +1,9 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl libltdl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" + +DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" +RDEPENDS = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb index 61e145a549..b312382e81 100644 --- a/packages/gnome/gnome-games_2.23.6.bb +++ b/packages/gnome/gnome-games_2.23.6.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common" +DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop" PR = "r1" @@ -10,6 +10,7 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \ --with-ggzmod-includes=${STAGING_INCDIR} \ --with-ggzmod-libraries=${STAGING_LIBDIR} \ --enable-scalable \ + --enable-omitgames=aisleriot \ " do_configure_prepend() { diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb index 933be7f811..0192d863c5 100644 --- a/packages/gnome/gnome-panel_2.18.1.bb +++ b/packages/gnome/gnome-panel_2.18.1.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus" +DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" PR = "r1" @@ -16,6 +16,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons" +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" + do_stage() { autotools_stage_all } diff --git a/packages/gnome/gnome-python-desktop/acinclude.m4 b/packages/gnome/gnome-python-desktop/acinclude.m4 new file mode 100644 index 0000000000..53518fb2eb --- /dev/null +++ b/packages/gnome/gnome-python-desktop/acinclude.m4 @@ -0,0 +1,90 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN(AM_CHECK_PYMOD, +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +AC_ARG_WITH(python-includes, + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) +if test x$py_exec_prefix != x; then +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" +else +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include <Python.h>],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) + +dnl +dnl JH_ADD_CFLAG(FLAG) +dnl checks whether the C compiler supports the given flag, and if so, adds +dnl it to $CFLAGS. If the flag is already present in the list, then the +dnl check is not performed. +AC_DEFUN([JH_ADD_CFLAG], +[ +case " $CFLAGS " in +*@<:@\ \ @:>@$1@<:@\ \ @:>@*) + ;; +*) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_MSG_CHECKING([whether [$]CC understands $1]) + AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) + AC_MSG_RESULT($jh_has_option) + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi + ;; +esac]) diff --git a/packages/gpe-taskmanager/files/.mtn2git_empty b/packages/gpe-taskmanager/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-taskmanager/files/.mtn2git_empty diff --git a/packages/gpe-taskmanager/files/setlocale.patch b/packages/gpe-taskmanager/files/setlocale.patch new file mode 100644 index 0000000000..b5ef1c99ea --- /dev/null +++ b/packages/gpe-taskmanager/files/setlocale.patch @@ -0,0 +1,12 @@ +Index: gpe-taskmanager-0.20/gpe-taskmanager.c +=================================================================== +--- gpe-taskmanager-0.20.orig/gpe-taskmanager.c 2008-08-21 18:23:11.544135137 +0200 ++++ gpe-taskmanager-0.20/gpe-taskmanager.c 2008-08-21 18:23:22.554712863 +0200 +@@ -12,6 +12,7 @@ + #include <stdio.h> + #include <libintl.h> + #include <stdlib.h> ++#include <locale.h> + + #include <X11/Xlib.h> + #include <X11/Xatom.h> diff --git a/packages/gpe-taskmanager/gpe-taskmanager_0.20.bb b/packages/gpe-taskmanager/gpe-taskmanager_0.20.bb index d3d24ca09f..7d0ff8e55f 100644 --- a/packages/gpe-taskmanager/gpe-taskmanager_0.20.bb +++ b/packages/gpe-taskmanager/gpe-taskmanager_0.20.bb @@ -5,4 +5,5 @@ DEPENDS = "libgpelaunch libgpewidget" inherit gpe +SRC_URI += "file://setlocale.patch;patch=1" diff --git a/packages/guile/guile-amd64.patch b/packages/guile/guile-amd64.patch deleted file mode 100644 index dc9cea254f..0000000000 --- a/packages/guile/guile-amd64.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- guile-1.6.4/libguile/gc_os_dep.c 2003-04-16 20:16:21.000000000 +0000 -+++ guile-1.6.4-amd64/libguile/gc_os_dep.c 2003-10-20 01:52:11.543267320 +0000 -@@ -205,6 +205,10 @@ - # define I386 - # define mach_type_known - # endif -+# if defined(LINUX) && defined(__x86_64__) -+# define IA64 -+# define mach_type_known -+# endif - # if defined(LINUX) && (defined(__ia64__) || defined(__ia64)) - # define IA64 - # define mach_type_known diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb index fa6e696896..8cdd98c7d4 100644 --- a/packages/guile/guile_1.8.5.bb +++ b/packages/guile/guile_1.8.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \ packaged as a library which can be incorporated into your programs." HOMEPAGE = "http://www.gnu.org/software/guile/guile.html" SECTION = "devel/scheme" -DEPENDS = "guile-native" +DEPENDS = "guile-native gmp" LICENSE = "GPL" PR = "r1" diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc index af6fd47ee6..b5655c6d35 100644 --- a/packages/jamvm/jamvm.inc +++ b/packages/jamvm/jamvm.inc @@ -7,6 +7,7 @@ RDEPENDS = "classpath" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz" +PROVIDES = "jamvm virtual/java" RPROVIDES_jamvm = "java2-runtime" # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch b/packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch new file mode 100644 index 0000000000..b828327a00 --- /dev/null +++ b/packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch @@ -0,0 +1,125 @@ +Index: linux-2.6.25/drivers/input/Kconfig +=================================================================== +--- linux-2.6.25.orig/drivers/input/Kconfig 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25/drivers/input/Kconfig 2008-08-21 16:37:40.000000000 +0200 +@@ -69,6 +69,13 @@ + To compile this driver as a module, choose M here: the + module will be called mousedev. + ++config INPUT_VMS ++ tristate "Virtual Mouse Driver" if EMBEDDED ++ default y ++ ---help--- ++ vms.c from the book Essential Linux Device Drivers ++ ++ + config INPUT_MOUSEDEV_PSAUX + bool "Provide legacy /dev/psaux device" + default y +Index: linux-2.6.25/drivers/input/Makefile +=================================================================== +--- linux-2.6.25.orig/drivers/input/Makefile 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25/drivers/input/Makefile 2008-08-21 16:37:40.000000000 +0200 +@@ -11,6 +11,8 @@ + obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o + + obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o ++ ++obj-$(CONFIG_INPUT_VMS) += vms.o + obj-$(CONFIG_INPUT_JOYDEV) += joydev.o + obj-$(CONFIG_INPUT_EVDEV) += evdev.o + obj-$(CONFIG_INPUT_EVBUG) += evbug.o +Index: linux-2.6.25/drivers/input/vms.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.25/drivers/input/vms.c 2008-08-21 17:24:05.000000000 +0200 +@@ -0,0 +1,89 @@ ++/** ++ * Copyright (c) 2008 by Pearson Education, Inc. ++ * ++ * This material may be distributed only subject to the terms and conditions ++ * set forth in the Open Publication License, v1.0 or later (the latest version ++ * is presently available at http://www.opencontent.org/openpub/). ++ * ++ * Copyright (c) 2008 Leon Woestenberg ++ * Copyright (c) 2008 Sreekrishnan Venkateswaran ++ * ++ * I copied this from Sreekrishnan's book (see http://elinuxdd.com) -- Leon. ++ * ++ */ ++ ++#include <linux/fs.h> ++#include <asm/uaccess.h> ++#include <linux/input.h> ++#include <linux/platform_device.h> ++ ++struct input_dev *vms_input_dev; ++static struct platform_device *vms_dev; ++ ++/* for each set of coordinates, we publish them along with a left button ++ * press and release event ++ */ ++static ssize_t write_vms(struct device *dev, struct device_attribute *attr, ++ const char *buffer, size_t count) ++{ ++ int x, y; ++ sscanf(buffer, "%d%d", &x, &y); ++ input_report_abs(vms_input_dev, ABS_X, x); ++ input_report_abs(vms_input_dev, ABS_Y, y); ++ input_report_key(vms_input_dev, BTN_LEFT, 1); ++ input_sync(vms_input_dev); ++ input_report_key(vms_input_dev, BTN_LEFT, 0); ++ input_sync(vms_input_dev); ++ return count; ++} ++ ++DEVICE_ATTR(coordinates, 0644, NULL, write_vms); ++ ++static struct attribute *vms_attrs[] = { ++ &dev_attr_coordinates.attr, ++ NULL ++}; ++ ++static struct attribute_group vms_attr_group = { ++ .attrs = vms_attrs, ++}; ++ ++static int __init vms_init(void) ++{ ++ vms_dev = platform_device_register_simple("vms", -1, NULL, 0); ++ if (IS_ERR(vms_dev)) { ++ PTR_ERR(vms_dev); ++ printk("vms_init: error\n"); ++ } ++ sysfs_create_group(&vms_dev->dev.kobj, &vms_attr_group); ++ ++ vms_input_dev = input_allocate_device(); ++ if (!vms_input_dev) { ++ printk("bad input_allocate_device()\n"); ++ } ++ ++ set_bit(EV_ABS, vms_input_dev->evbit); ++ set_bit(ABS_X, vms_input_dev->absbit); ++ set_bit(ABS_Y, vms_input_dev->absbit); ++ ++ set_bit(EV_KEY, vms_input_dev->evbit); ++ set_bit(BTN_LEFT, vms_input_dev->keybit); ++ ++ input_register_device(vms_input_dev); ++ printk("vms initialized\n"); ++ return 0; ++} ++ ++static int __init vms_exit(void) ++{ ++ input_unregister_device(vms_input_dev); ++ sysfs_remove_group(&vms_dev->dev.kobj, &vms_attr_group); ++ platform_device_unregister(vms_dev); ++ return; ++} ++ ++module_init(vms_init); ++module_exit(vms_exit); ++ ++MODULE_LICENSE("GPL"); ++ diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index dc9a35e3bb..41f11d2c87 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r4" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -31,6 +31,7 @@ SRC_URI_append_cm-x270 = " \ SRC_URI_append_at32stk1000 = " \ http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1 \ + file://virtualmouse.patch;patch=1 \ " SRC_URI_append_at91-l9260 = " \ diff --git a/packages/minimix/files/.mtn2git_empty b/packages/minimix/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/minimix/files/.mtn2git_empty diff --git a/packages/minimix/files/setlocale.patch b/packages/minimix/files/setlocale.patch new file mode 100644 index 0000000000..d0bc120f4f --- /dev/null +++ b/packages/minimix/files/setlocale.patch @@ -0,0 +1,20 @@ +Index: minimix-0.9/minimix.c +=================================================================== +--- minimix-0.9.orig/minimix.c 2008-08-21 18:14:22.089134309 +0200 ++++ minimix-0.9/minimix.c 2008-08-21 18:19:50.741374220 +0200 +@@ -19,6 +19,7 @@ + #include <string.h> + #include <errno.h> + #include <libintl.h> ++#include <locale.h> + + #include <gtk/gtk.h> + #include <gdk/gdkx.h> +@@ -33,7 +34,6 @@ + #include <sys/ioctl.h> + #include <sys/soundcard.h> + +- + GtkWidget *slider_window; + GtkWidget *window, *slider; + GtkWidget *icon; diff --git a/packages/minimix/minimix_0.9.bb b/packages/minimix/minimix_0.9.bb index feb45c50ad..81e48bffed 100644 --- a/packages/minimix/minimix_0.9.bb +++ b/packages/minimix/minimix_0.9.bb @@ -6,3 +6,5 @@ DEPENDS = "libgpewidget" GPE_TARBALL_SUFFIX = "bz2" inherit gpe autotools + +SRC_URI += "file://setlocale.patch;patch=1" diff --git a/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty diff --git a/packages/xscreensaver/xscreensaver-5.07/configure.in.patch b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch new file mode 100644 index 0000000000..384b134037 --- /dev/null +++ b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch @@ -0,0 +1,91 @@ +--- /tmp/configure.in 2008-08-21 12:56:59.000000000 +0200 ++++ xscreensaver-5.07/configure.in 2008-08-21 13:06:16.293198000 +0200 +@@ -952,9 +952,6 @@ + # + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) +@@ -964,9 +961,6 @@ + # + AC_DEFUN(AC_EGREP_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + AC_EGREP_HEADER([$1], [$2], [$3], [$4]) +@@ -976,9 +970,6 @@ + # + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) +@@ -993,9 +984,6 @@ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +@@ -1018,9 +1006,6 @@ + # + AC_DEFUN(AC_TRY_X_RUN, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + AC_TRY_RUN([$1], [$2], [$3], [$4]) +@@ -1099,11 +1084,8 @@ + + # random compiler setup + AC_CANONICAL_HOST +-AC_PROG_CC_ANSI + AC_NO_LONG_STRING_WARNINGS + AC_NO_MISPLACED_DECLARATIONS +-AC_NO_OBJECTIVE_C +-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE +@@ -2831,9 +2813,6 @@ + EOF + + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:` +@@ -3515,16 +3494,6 @@ + DEPEND_FLAGS= + DEPEND_DEFINES= + +- +-if test \! -z "$includedir" ; then +- INCLUDES="$INCLUDES -I$includedir" +-fi +- +-if test \! -z "$libdir" ; then +- LDFLAGS="$LDFLAGS -L$libdir" +-fi +- +- + PREFERRED_DEMO_PROGRAM='' + ALL_DEMO_PROGRAMS= + if test "$have_motif" = yes; then diff --git a/packages/xscreensaver/xscreensaver_5.07.bb b/packages/xscreensaver/xscreensaver_5.07.bb new file mode 100644 index 0000000000..8e288b872a --- /dev/null +++ b/packages/xscreensaver/xscreensaver_5.07.bb @@ -0,0 +1,63 @@ +# xscreensaver OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "*The* screensaver package for X11" +HOMEPAGE = "http://www.jwz.org/xscreensaver/" +SECTION = "x11-misc" +LICENSE = "BSD" +DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" + + +SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ + file://configure.in.patch;patch=1 \ + file://XScreenSaver" + +# xscreensaver-demo is a glade app +LDFLAGS_append = " -Wl,--export-dynamic" + +inherit autotools + +export INTLTOOL_PERL="/usr/bin/env perl" + +EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \ + --with-jpeg --with-xpm" + +PACKAGES =+ " xscreensaver-demo xscreensaver-extra" + +FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \ + /usr/X11R6/lib/X11/app-defaults" + +FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \ + ${datadir}/pixmaps/" + +FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*" + +do_configure_prepend() { + sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in + + export includedir="/lib" +} + +do_compile() { + oe_runmake GNOME_DATADIR=${datadir} all +} + +do_install() { + unset KDEDIR + oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \ + install_prefix=${D} install + + oe_runmake -C ${S}/hacks install_prefix=${D} install-program + + # Install the defaults file + install -d ${D}/usr/X11R6/lib/X11/app-defaults + install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults +} + +PACKAGES_DYNAMIC = "xscreensaver-hack-*" + +python populate_packages_prepend () { + hackdir = bb.data.expand('${libexecdir}/xscreensaver', d) + do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s') +} |