Skip to content

Commit a4d04a6

Browse files
committed
feat: Share Module - squash commits
1 parent c302d73 commit a4d04a6

File tree

16 files changed

+625
-571
lines changed

16 files changed

+625
-571
lines changed

.github/workflows/build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: Install dependencies
49-
run: sudo apt update && sudo apt-get install libgpac-dev
49+
run: sudo apt update && sudo apt-get install libgpac-dev libnanomsg-dev
5050
- uses: actions/checkout@v4
5151
- name: run autogen
5252
run: ./autogen.sh

.github/workflows/build_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
- name: Install dependencies
50-
run: brew install pkg-config autoconf automake libtool gpac
50+
run: brew install pkg-config autoconf automake libtool gpac nanomsg
5151
- name: run autogen
5252
run: ./autogen.sh
5353
working-directory: ./mac

docs/CHANGES.TXT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,3 +1291,4 @@ version of CCExtractor.
12911291
- Added video information (as extracted from sequence header).
12921292
- Some code clean-up.
12931293
- FF sanity check enabled by default.
1294+
- Added Share Module to lib_ccxr

linux/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ ccextractor_LDADD += $(LEPT_LIB)
334334
endif
335335

336336
if WITH_RUST
337-
ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a
337+
ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a -lnanomsg
338338
else
339339
ccextractor_CFLAGS += -DDISABLE_RUST
340340
ccextractor_CPPFLAGS += -DDISABLE_RUST

mac/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ endif
244244

245245
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP
246246

247-
ccextractor_LDFLAGS = $(shell pkg-config --libs gpac)
247+
ccextractor_LDFLAGS = $(shell pkg-config --libs gpac nanomsg)
248248
GPAC_CPPFLAGS = $(shell pkg-config --cflags gpac)
249249

250250
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/

src/rust/Cargo.lock

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ cfg-if = "1.0.0"
2828
num-integer = "0.1.46"
2929
lib_ccxr = { path = "lib_ccxr" }
3030
url = "2.5.4"
31-
libc = "0.2.172"
3231

3332
[build-dependencies]
3433
bindgen = "0.64.0"

src/rust/lib_ccxr/Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/lib_ccxr/Cargo.toml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,16 @@ crc32fast = "1.4.2"
1717
num_enum = "0.6.1"
1818
prost = "0.13.5"
1919
lazy_static = "1.5.0"
20-
nanomsg-sys = "0.7.2"
21-
libc = "0.2.172"
22-
20+
nanomsg-sys = { version = "0.7.2", optional = true, default-features = false, features = ["bundled"] }
2321
[features]
2422
default = [
25-
"enable_sharing",
26-
"wtv_debug",
27-
"enable_ffmpeg",
28-
"debug",
29-
"with_libcurl",
23+
"enable_sharing",
24+
"wtv_debug",
25+
"enable_ffmpeg",
26+
"debug",
27+
"with_libcurl",
3028
]
31-
enable_sharing = []
29+
enable_sharing = ["nanomsg-sys"]
3230
wtv_debug = []
3331
enable_ffmpeg = []
3432
debug_out = []

src/rust/lib_ccxr/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
pub mod activity;
22
pub mod common;
33
pub mod hardsubx;
4+
#[cfg(feature = "enable_sharing")]
5+
pub mod share;
46
pub mod subtitle;
57
pub mod teletext;
68
pub mod time;
79
pub mod util;
8-
#[cfg(feature = "enable_sharing")]
9-
pub mod share;

0 commit comments

Comments
 (0)