Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to Ubuntu Noble #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Port to Ubuntu Noble #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb52bc8
Port to Ubuntu Noble
hatstand Oct 14, 2024
b0ee0f1
Fix configure for glib
hatstand Oct 14, 2024
dd79461
Allow redefinitions for glib
hatstand Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-24.04
container:
image: ubuntu:eoan
image: ubuntu:noble
steps:
- name: Accept EULAs
env:
Expand All @@ -19,6 +19,7 @@ jobs:
apt-get update && apt-get install -y -q
autoconf
bison
bzip2
cmake
flex
gettext
Expand All @@ -30,15 +31,16 @@ jobs:
nsis
pkg-config
protobuf-compiler
python
python-dev
python3
python3-dev
stow
sudo
texinfo
unzip
wget
wine-stable
yasm
xz-utils
- name: Configure Mingw for POSIX threads
run: update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
- name: Configure Mingw for POSIX threads
Expand Down
11 changes: 6 additions & 5 deletions downloader/downloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import hashlib
import os
import sys
import urllib

from urllib.request import urlretrieve

DOWNLOAD_URL = 'https://storage.googleapis.com/clementine-data.appspot.com/Build%20dependencies/'

Expand Down Expand Up @@ -74,7 +75,7 @@ def Md5File(path):

file_hash = hashlib.md5()
try:
with open(path) as fh:
with open(path, mode='rb') as fh:
while True:
chunk = fh.read(4096)
if len(chunk) == 0:
Expand Down Expand Up @@ -103,8 +104,8 @@ def DownloadFiles(flags):
if actual_md5_checksum != md5_checksum:
url = DOWNLOAD_URL + name

print 'Downloading %s...' % name
urllib.urlretrieve(url, path)
print('Downloading %s...' % name)
urlretrieve(url, path)
actual_md5_checksum = Md5File(path)

# If the checksum still didn't match the download must have failed.
Expand All @@ -113,7 +114,7 @@ def DownloadFiles(flags):
'Download failed - checksums do not match (got %s, expected %s)' %
(actual_md5_checksum, md5_checksum))

print 'All files are up-to-date'
print('All files are up-to-date')


def Main(argv):
Expand Down
4 changes: 2 additions & 2 deletions makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ all:
$(MAKE) clementine-deps

clean:
realstow=`python -c "import os.path; print os.path.realpath('$(stow)')"`; \
realstow=`python3 -c "import os.path; print os.path.realpath('$(stow)')"`; \
for path in $(stow)/*; do \
directory=`basename $$path`; \
stow -d $$realstow -D $$directory; \
Expand All @@ -148,7 +148,7 @@ clean:
-rm .done-*

all-downloads:
python $(src)/downloader/downloader.py --output "$(downloads)"
python3 $(src)/downloader/downloader.py --output "$(downloads)"

boost: .done-boost
cdio: .done-cdio
Expand Down
6 changes: 3 additions & 3 deletions windows/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ dont_strip=-not -name glew32.dll \
-not -name AccessControl.dll

# Useful macros for building packages
pkgconfig=PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig
pkgconfig=PKG_CONFIG_PATH=$(prefix)/pkgconfig PKG_CONFIG_SYSROOT_DIR=$(prefix) PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig
autoconf=ACLOCAL_PATH=$(prefix)/share/aclocal:/usr/share/aclocal
ldflags=-L$(prefix)/lib -lpthread
# -O2 is required to work around link errors in gettext
Expand Down Expand Up @@ -271,8 +271,8 @@ clementine-deps: clementine-build-deps clementine-gst-plugins openssl glibnetwor

.done-glib: .done-zlib .done-gettext .done-ffi .done-pcre
$(call extractpkg,$(glibtgz))
cd $(glib) && ./autogen.sh
cd $(glib) && $(configure) CFLAGS="$(cflags) -Wno-format-security -Wno-format-overflow -Wno-format-nonliteral"
cd $(glib) && NOCONFIGURE=1 ./autogen.sh
cd $(glib) && $(configure) --disable-libmount CFLAGS="$(cflags) -Wno-format-security -Wno-format-overflow -Wno-format-nonliteral" LDFLAGS="-Wl,-allow-multiple-definition"
cd $(glib) && $(make)
$(call installpkg,$(glib))

Expand Down
Loading