forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
371 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO OpenPrinting/cups | ||
| REF "v${VERSION}" | ||
| SHA512 9def5d66ff000fa36cc00749c9e3533348f55fa34724bab9fe8d982db990003c499b4acf2c8ae81d30a0c0ffded39b51f36eb391ab06a1da79bbe7d28a270cc8 | ||
| HEAD_REF master | ||
| ) | ||
|
|
||
| file(REMOVE "${SOURCE_PATH}/configure.ac") | ||
| vcpkg_configure_make( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| COPY_SOURCE | ||
| ) | ||
|
|
||
| #vcpkg_build_make(BUILD_TARGET depend LOGFILE_ROOT depend) | ||
| vcpkg_install_make() | ||
| vcpkg_fixup_pkgconfig() | ||
| vcpkg_copy_pdbs() | ||
|
|
||
| #TODO: Check some full install path defines from the configure log an how they are used in the code. | ||
|
|
||
| set(cups-config-file "${CURRENT_PACKAGES_DIR}/tools/cups/bin/cups-config") | ||
| file(READ "${cups-config-file}" cups-config) | ||
| string(REPLACE | ||
| [[#!/bin/sh]] | ||
| [[#!/bin/sh | ||
| vcpkg_prefix=$( realpath "$0" ) && dirname "$vcpkg_prefix"]] | ||
| cups-config "${cups-config}") | ||
| string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${vcpkg_prefix}/../../..]] cups-config "${cups-config}") | ||
| file(WRITE "${cups-config-file}" "${cups-config}") | ||
|
|
||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/cups/cupsd.conf" "${CURRENT_INSTALLED_DIR}" "") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/cups/cups-files.conf" "${CURRENT_INSTALLED_DIR}" "") | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
|
|
||
| file(REMOVE_RECURSE | ||
| "${CURRENT_PACKAGES_DIR}/etc/cups/ppd" | ||
| "${CURRENT_PACKAGES_DIR}/etc/cups/ssl" | ||
| "${CURRENT_PACKAGES_DIR}/lib/cups/driver" | ||
| "${CURRENT_PACKAGES_DIR}/share/cups/cups/data" | ||
| "${CURRENT_PACKAGES_DIR}/share/cups/cups/model" | ||
| "${CURRENT_PACKAGES_DIR}/share/cups/cups/banners" | ||
| "${CURRENT_PACKAGES_DIR}/share/cups/cups/profiles" | ||
| "${CURRENT_PACKAGES_DIR}/var" | ||
| ) | ||
|
|
||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "name": "cups", | ||
| "version": "2.4.8", | ||
| "description": "OpenPrinting CUPS Sources", | ||
| "homepage": "https://openprinting.github.io/cups/cups3.html", | ||
| "license": "Apache-2.0", | ||
| "supports": "!windows", | ||
| "dependencies": [ | ||
| "openssl" | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
ports/ffmpeg/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git a/libavformat/avformat.h b/libavformat/avformat.h | ||
| index cd7b0d941c..b4a6dce885 100644 | ||
| --- a/libavformat/avformat.h | ||
| +++ b/libavformat/avformat.h | ||
| @@ -1010,7 +1010,11 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); | ||
| attribute_deprecated | ||
| int64_t av_stream_get_end_pts(const AVStream *st); | ||
| #endif | ||
|
|
||
| +// Chromium: We use the internal field first_dts vvv | ||
| +int64_t av_stream_get_first_dts(const AVStream *st); | ||
| +// Chromium: We use the internal field first_dts ^^^ | ||
| + | ||
| #define AV_PROGRAM_RUNNING 1 | ||
|
|
||
| /** | ||
| diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c | ||
| index de7580c32d..0ef0fe530e 100644 | ||
| --- a/libavformat/mux_utils.c | ||
| +++ b/libavformat/mux_utils.c | ||
| @@ -33,7 +33,14 @@ int64_t av_stream_get_end_pts(const AVStream *st) | ||
| return AV_NOPTS_VALUE; | ||
| } | ||
| #endif | ||
|
|
||
| +// Chromium: We use the internal field first_dts vvv | ||
| +int64_t av_stream_get_first_dts(const AVStream *st) | ||
| +{ | ||
| + return cffstream(st)->first_dts; | ||
| +} | ||
| +// Chromium: We use the internal field first_dts ^^^ | ||
| + | ||
| int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, | ||
| int std_compliance) | ||
| { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| prefix=${pcfiledir}/../.. | ||
| exec_prefix=${prefix}/tools/nss | ||
| libdir=${prefix}/lib | ||
| includedir=${prefix}/include/nss | ||
|
|
||
| Name: NSS | ||
| Description: Network Security Services | ||
| Version: @VERSION@ | ||
| Requires: nspr | ||
| Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 | ||
| Cflags: -I${includedir} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.