Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
lektor
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Kubat
lektor
Validations
7855e479
Vérifiée
Valider
7855e479
rédigé
Il y a 3 ans
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
DOC & BUILD: Update readme + cmake file
parent
856c27b4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion
!169
Solves #90 - Database automatic upgrade
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
CMakeLists.txt
+16
-15
16 ajouts, 15 suppressions
CMakeLists.txt
README.md
+3
-16
3 ajouts, 16 suppressions
README.md
avec
19 ajouts
et
31 suppressions
CMakeLists.txt
+
16
−
15
Voir le fichier @
7855e479
...
@@ -47,41 +47,42 @@ set(clang_C_FLAGS
...
@@ -47,41 +47,42 @@ set(clang_C_FLAGS
)
)
# Find dependencies
# Find dependencies
find_library
(
MPV_LIBRARY mpv REQUIRED
)
find_library
(
MPV_LIBRARY mpv REQUIRED
)
# tested with 0.32.0
find_library
(
SQLITE3_LIBRARY sqlite3 REQUIRED
)
find_library
(
SQLITE3_LIBRARY sqlite3 REQUIRED
version>=3.31.0
)
# tested with 3.34.1
find_package
(
SDL2 REQUIRED
)
find_package
(
SDL2 REQUIRED
version>=2.0
)
# tested with 2.0.14
find_package
(
SDL2_image REQUIRED
)
find_package
(
SDL2_image REQUIRED
version>=2.0
)
# same as above ^
find_package
(
CURL REQUIRED HTTP HTTPS
)
find_package
(
CURL REQUIRED HTTP HTTPS
)
# tested with 7.74.0
find_program
(
MKVPROPEDIT mkvpropedit REQUIRED
)
find_program
(
MKVPROPEDIT mkvpropedit REQUIRED
)
# To DL karas and apply metadata
find_program
(
XXD xxd REQUIRED
)
find_program
(
XXD xxd REQUIRED
)
# To embed the sqlite db schemas into the binary
find_program
(
MAN man
)
TEST_BIG_ENDIAN
(
IS_BIG_ENDIAN
)
TEST_BIG_ENDIAN
(
IS_BIG_ENDIAN
)
if
(
IS_BIG_ENDIAN
)
if
(
IS_BIG_ENDIAN
)
set
(
LKT_ENDIANES_BIG 1
)
set
(
LKT_ENDIANES_BIG 1
)
message
(
"Building lektor on
${
CMAKE_SYSTEM_PROCESSOR
}
- big endian"
)
message
(
STATUS
"Building lektor on
${
CMAKE_SYSTEM_PROCESSOR
}
- big endian"
)
else
()
else
()
set
(
LKT_ENDIANES_LITTLE 1
)
set
(
LKT_ENDIANES_LITTLE 1
)
message
(
"Building lektor on
${
CMAKE_SYSTEM_PROCESSOR
}
- little endian"
)
message
(
STATUS
"Building lektor on
${
CMAKE_SYSTEM_PROCESSOR
}
- little endian"
)
endif
()
endif
()
# Don't forget for specific things
# Don't forget for specific things
if
(
WIN32
)
if
(
WIN32
)
message
(
"You are building on windows, pay attenion to the dependencies"
)
message
(
STATUS
"You are building on windows, pay attenion to the dependencies"
)
set
(
GENERATE_MANPAGES 0
)
set
(
GENERATE_MANPAGES 0
)
endif
()
endif
()
if
(
MSVC OR MSYS OR MINGW
)
if
(
MSVC OR MSYS OR MINGW
)
message
(
"You are building with a windows compiler"
)
message
(
STATUS
"You are building with a windows compiler"
)
set
(
GENERATE_MANPAGES 0
)
set
(
GENERATE_MANPAGES 0
)
endif
()
endif
()
if
(
APPLE
)
if
(
APPLE
)
message
(
"You are building on MacOS X"
)
message
(
STATUS
"You are building on MacOS X"
)
find_program
(
MAN man REQUIRED
)
set
(
GENERATE_MANPAGES 1
)
set
(
GENERATE_MANPAGES 1
)
endif
()
endif
()
if
(
UNIX AND NOT APPLE
)
if
(
UNIX AND NOT APPLE
)
message
(
"You are building on Linux, FreeBSD or any other toaster OS"
)
message
(
STATUS
"You are building on Linux, FreeBSD or any other toaster OS"
)
find_program
(
MAN man REQUIRED
)
set
(
GENERATE_MANPAGES 1
)
set
(
GENERATE_MANPAGES 1
)
endif
()
endif
()
...
@@ -229,7 +230,7 @@ add_executable(lkt ${lkt_SOURCES})
...
@@ -229,7 +230,7 @@ add_executable(lkt ${lkt_SOURCES})
add_executable
(
luka
${
luka_SOURCES
}
${
SQL_GENERATED_FILE
}
)
add_executable
(
luka
${
luka_SOURCES
}
${
SQL_GENERATED_FILE
}
)
if
(
GENERATE_MANPAGES
)
if
(
GENERATE_MANPAGES
)
message
(
"Generating manpages"
)
message
(
STATUS
"Generating manpages"
)
set
(
MANPAGE_COMMANDS lkt lektord lektor luka
)
set
(
MANPAGE_COMMANDS lkt lektord lektor luka
)
foreach
(
CMD IN LISTS MANPAGE_COMMANDS
)
foreach
(
CMD IN LISTS MANPAGE_COMMANDS
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
README.md
+
3
−
16
Voir le fichier @
7855e479
...
@@ -19,11 +19,11 @@ A Karaoke player made to replace the old bash scripts on Sakura.
...
@@ -19,11 +19,11 @@ A Karaoke player made to replace the old bash scripts on Sakura.
### Prerequisites
### Prerequisites
-
[
cmake
](
https://cmake.org/
)
-
[
cmake
](
https://cmake.org/
)
with at least the version 3.5
-
a C compiler with C11 support
-
a C compiler with C11 support
-
the
[
sqlite3
](
https://www.sqlite.org/
)
development library, version
-
the
[
sqlite3
](
https://www.sqlite.org/
)
development library, version
3.
31.0 or newer for
[
generated columns
](
https://www.sqlite.org/gencol.html
)
support
3.
31.0 or newer for
[
generated columns
](
https://www.sqlite.org/gencol.html
)
support
-
a POSIX.1-2008 compatible system (i.e. not MS Windows)
-
a POSIX.1-2008 compatible system (i.e. not MS Windows)
(W support is TBD)
For the module sdl2, you will need the folowing prerequisites:
For the module sdl2, you will need the folowing prerequisites:
...
@@ -87,19 +87,6 @@ If you are using special modules or are compiling lektor without static
...
@@ -87,19 +87,6 @@ If you are using special modules or are compiling lektor without static
modules, you may set their
**absolute path**
inside the lektor's config
modules, you may set their
**absolute path**
inside the lektor's config
file.
file.
> **Important note**: if you are building using WSL, `lektord` will
likely not launch, because
`XDG_RUNTIME_DIR`
is not defined here. This
folder is important, this is where most of your deamons are puttings
theirs sockets and so. Blame Microsoft for that. A workaround is to
export one:
`export XDG_RUNTIME_DIR=$(mktemp -d)`
before launching
lektord. Be aware that you will have issues with sound and videos
becouse you will need to set up a X server...
> Currently, supported compilers are: `icc` 19.1.2.254 and above, `gcc`
8.
3.0 and above,
`clang`
7.0.1 and above. It compiles on debian, thus it
must compiles on your system (apport from CentOS, because I never tested
on it, and it no longer exists...).
## Preparing a kara for lektor
## Preparing a kara for lektor
The ideal way of populating lektor is using
*Kurisu*
. The
`update`
is
The ideal way of populating lektor is using
*Kurisu*
. The
`update`
is
...
@@ -165,7 +152,7 @@ Please, refer to the [CONTRIBUTING](CONTRIBUTING.md) file.
...
@@ -165,7 +152,7 @@ Please, refer to the [CONTRIBUTING](CONTRIBUTING.md) file.
## MPD
## MPD
Lektor is almost MPD compatible, at least it uses the same protocol,
Lektor is almost MPD compatible, at least it uses the same protocol,
which can be
got
te
n
which can be
consul
te
d
[
here
](
https://www.musicpd.org/doc/html/protocol.html#
)
. The full
[
here
](
https://www.musicpd.org/doc/html/protocol.html#
)
. The full
support for MPD clients (like mpc and ncmpc) is still WIP. For the MPD
support for MPD clients (like mpc and ncmpc) is still WIP. For the MPD
compatibility list, see the
[
CONTRIBUTING
](
CONTRIBUTING.md
)
file.
compatibility list, see the
[
CONTRIBUTING
](
CONTRIBUTING.md
)
file.
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter