Changeset f5e724f in rtems-source-builder


Ignore:
Timestamp:
Apr 15, 2016, 1:56:36 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.9, master
Children:
6843e47
Parents:
70fc466
git-author:
Chris Johns <chrisj@…> (04/15/16 01:56:36)
git-committer:
Chris Johns <chrisj@…> (04/15/16 01:59:30)
Message:

graphics: Add 3rd party graphics support back to the master branch.

The support is added at the top level and so not lost when we
move to a new version of RTEMS.

The change also moves all 3rd party packages to use a common
rtems-package.bset build set file.

All packages except Microwindows itself build cleanly.

Files:
15 added
8 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/graphics/microwindows-0.93-dev-1.cfg

    r70fc466 rf5e724f  
    1414%define microwindows_version 0.93-dev
    1515
     16%define rtems_git_tools_4_11 %{rtems_http_git}/rtems-tools/plain/tools/4.11
     17
     18%source set microwindows git://github.com/alex-sever-h/microwin.git
     19%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev.diff
     20%hash md5 microwindows-0.93-dev.diff 5b06e77d9ee42c8ff0032bba07d01c1a
     21%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev-without-keyboard.diff
     22%hash md5 microwindows-0.93-dev-without-keyboard.diff a675f55750754e1cd82a17496f0e8fab
     23
    1624#
    1725# microwindows Build configuration
  • rtems/config/graphics/t1lib-5.1.2-1.cfg

    r70fc466 rf5e724f  
    1717
    1818#
     19# Patch for RTEMS.
     20#
     21%patch add t1lib https://raw.githubusercontent.com/yangqiao/rtems-tools/graphics/tools/4.11/t1lib/t1lib-5.1.2.diff
     22%hash md5 t1lib-5.1.2.diff 98eeed85780227adf8525deab3679877
     23
     24#
    1925# t1lib Build configuration
    2026#
  • source-builder/config/freetype-1.cfg

    r70fc466 rf5e724f  
    4242  %{host_build_flags}
    4343
    44    ../${source_dir_freetype}/configure \
     44  %ifos freebsd
     45  GNUMAKE=%{__make} \
     46  %endif
     47  ../${source_dir_freetype}/configure \
    4548    --host=%{_host} \
    4649    --prefix=%{_prefix} \
  • source-builder/config/libpng-1.cfg

    r70fc466 rf5e724f  
    1313Version:   %{libpng_version}
    1414Release:   %{release}
    15 URL:     http://www.libpng.org/
     15URL:       http://www.libpng.org/
    1616BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1717
  • source-builder/config/libtiff-1.cfg

    r70fc466 rf5e724f  
    4343  %{host_build_flags}
    4444
    45   CFLAGS= CXXFLAGS= ../${source_dir_tiff}/configure \
     45  ../${source_dir_tiff}/configure \
    4646    --host=%{_host} \
    4747    --prefix=%{_prefix} \
  • source-builder/config/microwindows-1.cfg

    r70fc466 rf5e724f  
    1919# microwindows Source
    2020#
    21 %source set microwindows git://github.com/alex-sever-h/microwin.git
    22 %patch add microwindows %{rtems_git_tools}/microwindows/microwindows-0.93-dev.diff
    23 %hash md5 microwindows-0.93-dev.diff 5b06e77d9ee42c8ff0032bba07d01c1a
    24 %patch add microwindows %{rtems_git_tools}/microwindows/microwindows-0.93-dev-without-keyboard.diff
    25 %hash md5 microwindows-0.93-dev-without-keyboard.diff a675f55750754e1cd82a17496f0e8fab
     21%source set microwindows ftp://microwindows.censoft.com/pub/microwindows/microwindows-src-%{microwindows_version}.tar.gz
    2622
    2723#
     
    3935#
    4036# Build the source code.
    41 # The configure should be run in the source dir
    4237#
    4338%build
     
    5449  export RTEMS_MAKEFILE_PATH=%{rtems_bsp_prefix}
    5550
    56   make -f Makefile.rtems CONFIG=`pwd`/Configs/config.rtems -k all
     51  %{__make} -f Makefile.rtems CONFIG=`pwd`/Configs/config.rtems -k all
    5752
    5853  cd ${build_top}
  • source-builder/config/t1lib-1.cfg

    r70fc466 rf5e724f  
    1313Version:   %{t1lib_version}
    1414Release:   %{release}
    15 URL:     http://www.t1lib.org/
     15URL:       http://www.t1lib.org/
    1616BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1717
     
    2020#
    2121%source set t1lib ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/t1lib-%{t1lib_version}.tar.gz
    22 %patch add t1lib https://raw.githubusercontent.com/yangqiao/rtems-tools/graphics/tools/4.11/t1lib/t1lib-5.1.2.diff
    23 %hash md5 t1lib-5.1.2.diff 98eeed85780227adf8525deab3679877
    2422
    2523#
  • source-builder/defaults.mc

    r70fc466 rf5e724f  
    199199SB_SOURCE_DIR="%{_sourcedir}"
    200200SB_BUILD_DIR="%{_builddir}"
    201 # host == build, use build; host != build , host uses host and build uses build
     201# host == build, use build; host != build, host uses host and build uses build
     202SB_HOST_CPPFLAGS="%{host_includes}"
    202203SB_HOST_CFLAGS="%{host_cflags} %{host_includes}"
    203204SB_HOST_CXXFLAGS="%{host_cxxflags} %{host_includes}"
    204 SB_HOST_LDFLAGS="%{?host_ldflags:%{host_ldflags}}%{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
     205SB_HOST_LDFLAGS="%{?host_ldflags:%{host_ldflags}} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
    205206SB_BUILD_CFLAGS="%{build_cflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}"
    206207SB_BUILD_CXXFLAGS="%{build_cxxflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}"
    207 SB_BUILD_LDFLAGS="%{?build_ldflags:%{build_ldflags}}%{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
     208SB_BUILD_LDFLAGS="%{?build_ldflags:%{build_ldflags}} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
    208209SB_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}"
    209210SB_CXXFLAGS="${SB_BUILD_CXXFLAGS} %{build_includes}"
     
    211212SB_OS="%{_os}"
    212213export SB_SOURCE_DIR SB_BUILD_DIR SB_ARCH SB_OS
    213 export SB_HOST_CFLAGS SB_HOST_CXXFLAGS SB_HOST_LDFLAGS
     214export SB_HOST_CPPFLAGS SB_HOST_CFLAGS SB_HOST_CXXFLAGS SB_HOST_LDFLAGS
    214215export SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS
    215216export SB_CFLAGS SB_CXXFLAGS
     
    299300build_directory:     none,    none,     '''
    300301if test "%{_build}" != "%{_host}" ; then
    301   if test -z "%{_target}" ; then
     302  # Cross-build (Xc) if no target or the host and target match.
     303  # Canadian-cross (Cxc) if build, host and target are all different.
     304  if test -z "%{_target}" -o "%{_host}" == "%{_target}" ; then
    302305    build_dir="build-xc"
    303306  else
     
    317320  CC=$(echo "%{_host}-%{_host_cc}" | sed -e 's,-std=gnu99 ,,')
    318321  CXX=$(echo "%{_host}-%{_host_cxx}" | sed -e 's,-std=gnu99 ,,')
     322  CPPFLAGS="${SB_HOST_CPPFLAGS}"
    319323  CFLAGS="${SB_HOST_CFLAGS}"
    320324  CXXFLAGS="${SB_HOST_CXXFLAGS}"
    321325  LDFLAGS="${SB_HOST_LDFLAGS}"
    322326  # Host
     327  CPPFLAGS_FOR_HOST="${SB_HOST_CPPFLAGS}"
    323328  CFLAGS_FOR_HOST="${SB_HOST_CFLAGS}"
    324329  CXXFLAGS_FOR_HOST="${SB_HOST_CXXFLAGS}"
     
    341346  CXX_FOR_BUILD=${CXX}
    342347fi
    343 export CC CXX CFLAGS CXXFLAGS LDFLAGS
    344 export CC_FOR_HOST CXX_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST
     348export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
     349export CC_FOR_HOST CXX_FOR_HOST CPPFLAGS_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST
    345350export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD'''
    346351
Note: See TracChangeset for help on using the changeset viewer.