@@ -29,120 +29,239 @@ function build_versions()
2929 export QEMU_VERSION=" $( echo " ${RELEASE_VERSION} " | sed -e ' s|-.*||' ) "
3030
3131 # Keep them in sync with combo archive content.
32- if [[ " ${RELEASE_VERSION} " =~ 6\. 2\. * -* ]]
33- then
34-
3532 # -------------------------------------------------------------------------
3633
37- if [[ " ${RELEASE_VERSION} " =~ 6\. 2\. 0-1 ]]
38- then
39- (
40- xbb_activate
41-
42- QEMU_GIT_BRANCH=${QEMU_GIT_BRANCH:- " xpack-riscv-develop" }
43- QEMU_GIT_COMMIT=${QEMU_GIT_COMMIT:- " v${QEMU_VERSION} -xpack-riscv" }
34+ if [[ " ${RELEASE_VERSION} " =~ 7\. 0\. 0-1 ]]
35+ then
36+ (
37+ xbb_activate
38+
39+ # http://zlib.net/fossils/
40+ build_zlib " 1.2.12" # "1.2.11"
41+
42+ if [ " ${TARGET_PLATFORM} " != " win32" ]
43+ then
44+ # https://sourceware.org/pub/bzip2/
45+ build_bzip2 " 1.0.8"
46+ fi
47+
48+ # # https://github.com/facebook/zstd/releases
49+ build_zstd " 1.5.2" # "1.5.0"
50+
51+ # required by nettle
52+ # https://gmplib.org/download/gmp/
53+ build_gmp " 6.2.1"
54+
55+ # https://sourceforge.net/projects/libpng/files/libpng16/
56+ build_libpng " 1.6.37"
57+
58+ # http://www.ijg.org/files/
59+ build_jpeg " 9e" # "9d"
60+
61+ if [ " ${TARGET_PLATFORM} " != " win32" ]
62+ then
63+ # https://gitlab.gnome.org/GNOME/libxml2/-/releases
64+ build_libxml2 " 2.9.14"
65+ fi
66+
67+ # required by glib
68+ # https://ftp.gnu.org/pub/gnu/libiconv/
69+ build_libiconv " 1.16"
70+
71+ if false # [ "${TARGET_PLATFORM}" == "darwin" ]
72+ then
73+ : # On macOS use Cocoa.
74+ else
75+ # https://www.libsdl.org/release/
76+ build_sdl2 " 2.0.22"
77+ # https://www.libsdl.org/projects/SDL_image/release/
78+ build_sdl2_image " 2.0.5"
79+ fi
80+
81+ # required by glib
82+ # https://github.com/libffi/libffi/releases
83+ build_libffi " 3.4.2"
84+
85+ # required by glib
86+ # https://ftp.gnu.org/pub/gnu/gettext/
87+ build_gettext " 0.21"
88+
89+ # TODO "2.72.1" (meson)
90+ # https://download.gnome.org/sources/glib/
91+ build_glib " 2.56.4"
92+
93+ # Not toghether with nettle.
94+ # build_libgpg_error "1.43"
95+ # build_libgcrypt "1.9.4"
96+
97+ # https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnutls.rb
98+ # gnutls
99+
100+ # libslirp
101+
102+ # libcurl
103+
104+ if [ " ${TARGET_PLATFORM} " != " win32" ]
105+ then
106+ # required by libssh
107+ # https://www.openssl.org/source/
108+ build_openssl " 1.1.1n" # "1.1.1l"
109+
110+ # https://www.libssh.org/files/
111+ build_libssh " 0.9.6"
112+
113+ # meson checks for ncursesw, make this explicit.
114+ NCURSES_DISABLE_WIDEC=" n"
115+ # https://ftp.gnu.org/gnu/ncurses/
116+ build_ncurses " 6.3"
117+ fi
118+
119+ if [ " ${TARGET_PLATFORM} " == " win32" ]
120+ then
121+ # TODO: check if QEMU can use it or something else is needed.
122+ # https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/
123+ build_libusb_w32 " 1.2.6.0"
124+ else
125+ # https://github.com/libusb/libusb/releases/
126+ build_libusb " 1.0.26" # "1.0.24"
127+ fi
128+
129+ # https://www.oberhumer.com/opensource/lzo/
130+ build_lzo " 2.10"
131+
132+ # https://ftp.gnu.org/gnu/nettle/
133+ build_nettle " 3.7.3"
134+
135+ # https://www.cairographics.org/releases/
136+ build_pixman " 0.40.0"
137+
138+ # https://github.com/Homebrew/homebrew-core/blob/master/Formula/snappy.rb
139+ # snappy - Compression/decompression library aiming for high speed
140+
141+ if [ " ${TARGET_PLATFORM} " != " win32" ]
142+ then
143+ # required by vde
144+ # https://www.tcpdump.org/release/
145+ build_libpcap " 1.10.1"
146+ # https://sourceforge.net/projects/vde/files/vde2/
147+ build_vde " 2.3.2"
148+ fi
149+
150+ # Stick to upstream as long as possible.
151+ # https://github.com/qemu/qemu/tags
152+
153+ QEMU_GIT_URL=" https://git.qemu.org/git/qemu.git"
154+ QEMU_GIT_BRANCH=" master"
155+ QEMU_GIT_COMMIT=" v${QEMU_VERSION} "
156+
157+ build_qemu " ${QEMU_VERSION} " " riscv"
158+ )
159+
160+ # ---------------------------------------------------------------------------
161+ elif [[ " ${RELEASE_VERSION} " =~ 6\. 2\. 0-1 ]]
162+ then
163+ (
164+ xbb_activate
44165
45- build_zlib " 1.2.11"
166+ QEMU_GIT_BRANCH=${QEMU_GIT_BRANCH:- " xpack-riscv-develop" }
167+ QEMU_GIT_COMMIT=${QEMU_GIT_COMMIT:- " v${QEMU_VERSION} -xpack-riscv" }
46168
47- if [ " ${TARGET_PLATFORM} " != " win32" ]
48- then
49- build_bzip2 " 1.0.8"
50- fi
169+ build_zlib " 1.2.11"
51170
52- build_zstd " 1.5.0"
171+ if [ " ${TARGET_PLATFORM} " != " win32" ]
172+ then
173+ build_bzip2 " 1.0.8"
174+ fi
53175
54- # required by nettle
55- build_gmp " 6.2.1"
176+ build_zstd " 1.5.0"
56177
57- build_libpng " 1.6.37 "
58- build_jpeg " 9d "
178+ # required by nettle
179+ build_gmp " 6.2.1 "
59180
60- if [ " ${TARGET_PLATFORM} " != " win32" ]
61- then
62- build_libxml2 " 2.9.11"
63- fi
181+ build_libpng " 1.6.37"
182+ build_jpeg " 9d"
64183
65- # required by glib
66- build_libiconv " 1.16"
184+ if [ " ${TARGET_PLATFORM} " != " win32" ]
185+ then
186+ build_libxml2 " 2.9.11"
187+ fi
67188
68- if false # [ "${TARGET_PLATFORM}" == "darwin" ]
69- then
70- : # On macOS use Cocoa.
71- else
72- build_sdl2 " 2.0.18"
73- build_sdl2_image " 2.0.5"
74- fi
189+ # required by glib
190+ build_libiconv " 1.16"
75191
76- # required by glib
77- build_libffi " 3.4.2"
192+ if false # [ "${TARGET_PLATFORM}" == "darwin" ]
193+ then
194+ : # On macOS use Cocoa.
195+ else
196+ build_sdl2 " 2.0.18"
197+ build_sdl2_image " 2.0.5"
198+ fi
78199
79- # required by glib
80- build_gettext " 0.21 "
200+ # required by glib
201+ build_libffi " 3.4.2 "
81202
82- # TODO "2.70.2" (meson)
83- build_glib " 2.56.4 " #
203+ # required by glib
204+ build_gettext " 0.21 "
84205
85- # Not toghether with nettle.
86- # build_libgpg_error "1.43"
87- # build_libgcrypt "1.9.4"
206+ # TODO "2.70.2" (meson)
207+ build_glib " 2.56.4" #
88208
89- # https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnutls.rb
90- # gnutls
209+ # Not toghether with nettle.
210+ # build_libgpg_error "1.43"
211+ # build_libgcrypt "1.9.4"
91212
92- # libslirp
213+ # https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnutls.rb
214+ # gnutls
93215
94- # libcurl
216+ # libslirp
95217
218+ # libcurl
96219
97- if [ " ${TARGET_PLATFORM} " != " win32" ]
98- then
99- # required by libssh
100- build_openssl " 1.1.1l"
101220
102- build_libssh " 0.9.6"
221+ if [ " ${TARGET_PLATFORM} " != " win32" ]
222+ then
223+ # required by libssh
224+ build_openssl " 1.1.1l"
103225
226+ build_libssh " 0.9.6"
104227
105- build_ncurses " 6.3"
106- fi
107228
108- if [ " ${TARGET_PLATFORM} " == " win32" ]
109- then
110- # TODO: check if QEMU can use it or something else is needed.
111- build_libusb_w32 " 1.2.6.0"
112- else
113- build_libusb " 1.0.24"
114- fi
229+ build_ncurses " 6.3"
230+ fi
115231
116- build_lzo " 2.10"
232+ if [ " ${TARGET_PLATFORM} " == " win32" ]
233+ then
234+ # TODO: check if QEMU can use it or something else is needed.
235+ build_libusb_w32 " 1.2.6.0"
236+ else
237+ build_libusb " 1.0.24"
238+ fi
117239
118- build_nettle " 3.7.3 "
240+ build_lzo " 2.10 "
119241
120- build_pixman " 0.40.0 "
242+ build_nettle " 3.7.3 "
121243
122- # https://github.com/Homebrew/homebrew-core/blob/master/Formula/snappy.rb
123- # snappy - Compression/decompression library aiming for high speed
244+ build_pixman " 0.40.0"
124245
125- if [ " ${TARGET_PLATFORM} " != " win32" ]
126- then
127- # required by vde
128- build_libpcap " 1.10.1"
129- build_vde " 2.3.2"
130- fi
246+ # https://github.com/Homebrew/homebrew-core/blob/master/Formula/snappy.rb
247+ # snappy - Compression/decompression library aiming for high speed
131248
132- build_qemu " ${QEMU_VERSION} " " riscv"
133- )
249+ if [ " ${TARGET_PLATFORM} " != " win32" ]
250+ then
251+ # required by vde
252+ build_libpcap " 1.10.1"
253+ build_vde " 2.3.2"
254+ fi
134255
135- # -------------------------------------------------------------------------
136- else
137- echo " Unsupported version ${RELEASE_VERSION} ."
138- exit 1
139- fi
256+ build_qemu " ${QEMU_VERSION} " " riscv"
257+ )
140258
141- # -------------------------------------------------------------------------
259+ # -- -------------------------------------------------------------------------
142260 else
143261 echo " Unsupported version ${RELEASE_VERSION} ."
144262 exit 1
145263 fi
264+
146265}
147266
148267# -----------------------------------------------------------------------------
0 commit comments