Skip to content

Check for required GStreamer codecs in CMake #93

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

Open
kalikiana wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check for required GStreamer codecs in CMake #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Install dependencies
command: |
apt-get update
apt-get install -y cmake xvfb valac libwebkit2gtk-4.0-dev libsoup-gnome2.4-dev libgcr-3-dev libpeas-dev libsqlite3-dev intltool libxml2-utils
apt-get install -y --no-install-recommends cmake xvfb valac libwebkit2gtk-4.0-dev libsoup-gnome2.4-dev libgcr-3-dev libpeas-dev libsqlite3-dev intltool libxml2-utils gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-tools
- run:
name: Build
command: |
Expand Down
17 changes: 17 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,23 @@ set(CORE_USER_AGENT "Mozilla/5.0 ${CORE_OS} ${CORE_ENGINE} Midori/6")

configure_file(config.h.in config.h @ONLY)

# Check for required GStreamer codecs
find_program (GST_INSPECT_BIN gst-inspect-1.0)
if (NOT GST_INSPECT_BIN)
message(FATAL_ERROR "gst-inspect-1.0 not found")
endif ()
foreach (PLUGIN avmux_mp4 h264parse aacparse webmmux matroskaparse theoraparse)
execute_process(COMMAND ${GST_INSPECT_BIN} --exists ${PLUGIN}
RESULT_VARIABLE PLUGIN_FOUND
)
if (${PLUGIN_FOUND})
list(APPEND PLUGIN_ERRORS " ${PLUGIN}")
endif ()
endforeach ()
if (PLUGIN_ERRORS)
message(FATAL_ERROR "Required GStreamer plugins missing:\n " ${PLUGIN_ERRORS})
endif ()

# CMake provides no uninstall target by design
add_custom_target (uninstall
COMMAND "xargs" "rm" "-v" "<" "install_manifest.txt")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ you can install the **latest stable** version of Midori

Install dependencies on Ubuntu or Debian based distros:

sudo apt install valac libwebkit2gtk-4.0-dev libsoup-gnome2.4-dev libgcr-3-dev libpeas-dev libsqlite3-dev intltool libxml2-utils
sudo apt install cmake xvfb valac libwebkit2gtk-4.0-dev libsoup-gnome2.4-dev libgcr-3-dev libpeas-dev libsqlite3-dev intltool libxml2-utils gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-tools

Use CMake to build Midori:

Expand Down
1 change: 1 addition & 0 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ parts:
- intltool
- ninja-build
- libxml2-utils # xmllint
- gstreamer1.0-tools
stage-packages:
- libwebkit2gtk-4.0-37
- libgcr-base-3-1
Expand Down