diff options
author | Chris Johns <chrisj@rtems.org> | 2016-04-15 11:56:36 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-04-15 11:59:30 +1000 |
commit | f5e724fc077261119129f7a830396d79536cc0f4 (patch) | |
tree | 2e7b584c21dfb8d76685ae867bc40f6e6c00cdc7 /rtems | |
parent | rtems: Refactor to move to a single version on master. (diff) | |
download | rtems-source-builder-f5e724fc077261119129f7a830396d79536cc0f4.tar.bz2 |
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.
Diffstat (limited to 'rtems')
-rw-r--r-- | rtems/config/databases/sqlite.bset | 15 | ||||
-rw-r--r-- | rtems/config/graphics/freetype2.bset | 15 | ||||
-rw-r--r-- | rtems/config/graphics/graphics-all.bset | 9 | ||||
-rw-r--r-- | rtems/config/graphics/libjpeg.bset | 15 | ||||
-rw-r--r-- | rtems/config/graphics/libpng-1.6.21-1.cfg | 22 | ||||
-rw-r--r-- | rtems/config/graphics/libpng.bset | 15 | ||||
-rw-r--r-- | rtems/config/graphics/libtiff.bset | 15 | ||||
-rw-r--r-- | rtems/config/graphics/microwindows-0.93-dev-1.cfg | 8 | ||||
-rw-r--r-- | rtems/config/graphics/microwindows.bset | 16 | ||||
-rw-r--r-- | rtems/config/graphics/nxlib.bset | 16 | ||||
-rw-r--r-- | rtems/config/graphics/t1lib-5.1.2-1.cfg | 6 | ||||
-rw-r--r-- | rtems/config/graphics/t1lib.bset | 15 | ||||
-rw-r--r-- | rtems/config/net-mgmt/net-snmp.bset | 20 | ||||
-rw-r--r-- | rtems/config/net/lwip.bset | 15 | ||||
-rw-r--r-- | rtems/config/net/ntp.bset | 15 | ||||
-rw-r--r-- | rtems/config/net/protobuf.bset | 15 | ||||
-rw-r--r-- | rtems/config/rtems-package.bset | 13 |
17 files changed, 245 insertions, 0 deletions
diff --git a/rtems/config/databases/sqlite.bset b/rtems/config/databases/sqlite.bset new file mode 100644 index 0000000..f7c97b6 --- /dev/null +++ b/rtems/config/databases/sqlite.bset @@ -0,0 +1,15 @@ +# +# Build set for Sqlite +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build Sqlite +# +databases/sqlite-3.8.8.1-1 diff --git a/rtems/config/graphics/freetype2.bset b/rtems/config/graphics/freetype2.bset new file mode 100644 index 0000000..cb6c168 --- /dev/null +++ b/rtems/config/graphics/freetype2.bset @@ -0,0 +1,15 @@ +# +# Build set for freetype +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build freetype. +# +graphics/freetype-2.4.10-1.cfg diff --git a/rtems/config/graphics/graphics-all.bset b/rtems/config/graphics/graphics-all.bset new file mode 100644 index 0000000..5f94184 --- /dev/null +++ b/rtems/config/graphics/graphics-all.bset @@ -0,0 +1,9 @@ +# +# All RTEMS Graphics Build Sets +# + +graphics/libjpeg +graphics/libpng +graphics/libtiff +graphics/t1lib +graphics/nxlib diff --git a/rtems/config/graphics/libjpeg.bset b/rtems/config/graphics/libjpeg.bset new file mode 100644 index 0000000..a976edc --- /dev/null +++ b/rtems/config/graphics/libjpeg.bset @@ -0,0 +1,15 @@ +# +# Build set for libjpeg +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build libjpeg. +# +graphics/libjpeg-9a-1.cfg diff --git a/rtems/config/graphics/libpng-1.6.21-1.cfg b/rtems/config/graphics/libpng-1.6.21-1.cfg new file mode 100644 index 0000000..185413f --- /dev/null +++ b/rtems/config/graphics/libpng-1.6.21-1.cfg @@ -0,0 +1,22 @@ +# +# libpng 1.6.21 +# + +%if %{release} == %{nil} + %define release 1 +%endif + +%include %{_configdir}/rtems-bsp.cfg + +# +# libpng Version +# +%define libpng_version 1.6.21 +%define libpng_src_dir_revision 16 + +#%hash md5 libpng-%{libpng_version}.tar.gz 6652e428d1d3fc3c6cb1362159b1cf3b + +# +# libpng Build configuration +# +%include %{_configdir}/libpng-1.cfg diff --git a/rtems/config/graphics/libpng.bset b/rtems/config/graphics/libpng.bset new file mode 100644 index 0000000..4e6db7d --- /dev/null +++ b/rtems/config/graphics/libpng.bset @@ -0,0 +1,15 @@ +# +# Build set for libpng +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build libpng. +# +graphics/libpng-1.6.21-1.cfg diff --git a/rtems/config/graphics/libtiff.bset b/rtems/config/graphics/libtiff.bset new file mode 100644 index 0000000..35ddd44 --- /dev/null +++ b/rtems/config/graphics/libtiff.bset @@ -0,0 +1,15 @@ +# +# Build set for libtiff +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build libtiff. +# +graphics/libtiff-4.0.2-1.cfg diff --git a/rtems/config/graphics/microwindows-0.93-dev-1.cfg b/rtems/config/graphics/microwindows-0.93-dev-1.cfg index c0cdc86..7050fdb 100644 --- a/rtems/config/graphics/microwindows-0.93-dev-1.cfg +++ b/rtems/config/graphics/microwindows-0.93-dev-1.cfg @@ -13,6 +13,14 @@ # %define microwindows_version 0.93-dev +%define rtems_git_tools_4_11 %{rtems_http_git}/rtems-tools/plain/tools/4.11 + +%source set microwindows git://github.com/alex-sever-h/microwin.git +%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev.diff +%hash md5 microwindows-0.93-dev.diff 5b06e77d9ee42c8ff0032bba07d01c1a +%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev-without-keyboard.diff +%hash md5 microwindows-0.93-dev-without-keyboard.diff a675f55750754e1cd82a17496f0e8fab + # # microwindows Build configuration # diff --git a/rtems/config/graphics/microwindows.bset b/rtems/config/graphics/microwindows.bset new file mode 100644 index 0000000..68396c9 --- /dev/null +++ b/rtems/config/graphics/microwindows.bset @@ -0,0 +1,16 @@ +# +# Build set for Nano-X Window System +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build microwindows. +# +graphics/freetype2 +graphics/microwindows-0.93-dev-1.cfg diff --git a/rtems/config/graphics/nxlib.bset b/rtems/config/graphics/nxlib.bset new file mode 100644 index 0000000..4eb0422 --- /dev/null +++ b/rtems/config/graphics/nxlib.bset @@ -0,0 +1,16 @@ +# +# Build set for nxlib +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build nxlib. +# +graphics/microwindows +graphics/nxlib-0.47-dev-1.cfg diff --git a/rtems/config/graphics/t1lib-5.1.2-1.cfg b/rtems/config/graphics/t1lib-5.1.2-1.cfg index da18ba1..58eaa3b 100644 --- a/rtems/config/graphics/t1lib-5.1.2-1.cfg +++ b/rtems/config/graphics/t1lib-5.1.2-1.cfg @@ -16,6 +16,12 @@ %hash md5 t1lib-%{t1lib_version}.tar.gz a5629b56b93134377718009df1435f3c # +# Patch for RTEMS. +# +%patch add t1lib https://raw.githubusercontent.com/yangqiao/rtems-tools/graphics/tools/4.11/t1lib/t1lib-5.1.2.diff +%hash md5 t1lib-5.1.2.diff 98eeed85780227adf8525deab3679877 + +# # t1lib Build configuration # %include %{_configdir}/t1lib-1.cfg diff --git a/rtems/config/graphics/t1lib.bset b/rtems/config/graphics/t1lib.bset new file mode 100644 index 0000000..e74a650 --- /dev/null +++ b/rtems/config/graphics/t1lib.bset @@ -0,0 +1,15 @@ +# +# Build set for adobe type 1 library +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build t1lib. +# +graphics/t1lib-5.1.2-1.cfg diff --git a/rtems/config/net-mgmt/net-snmp.bset b/rtems/config/net-mgmt/net-snmp.bset new file mode 100644 index 0000000..667acaa --- /dev/null +++ b/rtems/config/net-mgmt/net-snmp.bset @@ -0,0 +1,20 @@ +# +# Build set for NetSNMP +# + +%define release 1 + +# +# RTEMS Version +# +%define rtems_version 4.11 + +# +# The RTEMS URL paths. +# +%include rtems-urls.bset + +# +# Build NetSNMP. +# +net-mgmt/net-snmp-5.7.2.1-1 diff --git a/rtems/config/net/lwip.bset b/rtems/config/net/lwip.bset new file mode 100644 index 0000000..79a83e6 --- /dev/null +++ b/rtems/config/net/lwip.bset @@ -0,0 +1,15 @@ +# +# Build set for LWIP +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build LWIP. +# +net/lwip-1-1.cfg diff --git a/rtems/config/net/ntp.bset b/rtems/config/net/ntp.bset new file mode 100644 index 0000000..e7feefa --- /dev/null +++ b/rtems/config/net/ntp.bset @@ -0,0 +1,15 @@ +# +# Build set for NTP +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build NTP. +# +net/ntp-4.2.6p5-1 diff --git a/rtems/config/net/protobuf.bset b/rtems/config/net/protobuf.bset new file mode 100644 index 0000000..1f09f6d --- /dev/null +++ b/rtems/config/net/protobuf.bset @@ -0,0 +1,15 @@ +# +# Build set for Google Protocol Buffers +# + +%define release 1 + +# +# The RTEMS Package defines +# +%include rtems-package.bset + +# +# Build Protocol Buffers. +# +net/protobuf-2.6.1-1 diff --git a/rtems/config/rtems-package.bset b/rtems/config/rtems-package.bset new file mode 100644 index 0000000..2b0ffc4 --- /dev/null +++ b/rtems/config/rtems-package.bset @@ -0,0 +1,13 @@ +# +# Build Set Base defines for RTEMS Packages +# + +# +# Get the version of RTEMS +# +%include rtems-version.bset + +# +# Pick up the RTEMS URLs. +# +%include rtems-urls.bset |