Skip to content

Commit 0313e7c

Browse files
committed
bluray --disable-shared
1 parent 5f107af commit 0313e7c

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

apple/do-compile/bluray.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "XC_OPTS:$XC_OPTS"
3333
echo "===check env end==="
3434

3535
# prepare build config
36-
CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --without-freetype --without-fontconfig --disable-doxygen-doc"
36+
CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --without-freetype --without-fontconfig --disable-doxygen-doc"
3737
CFLAGS="-arch $XC_ARCH $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS"
3838

3939
if [[ "$XC_OPTS" == "debug" ]];then

apple/do-compile/ffmpeg.sh

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; the
211211

212212
echo "[*] --enable-libbluray --enable-protocol=bluray"
213213
elif [[ -f "${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig/libbluray.pc" ]]; then
214-
215-
CFG_FLAGS="$CFG_FLAGS --enable-libxml2 --enable-libbluray --enable-protocol=bluray"
214+
# --enable-libxml2
215+
CFG_FLAGS="$CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
216216

217217
if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
218218
MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
@@ -277,18 +277,21 @@ if [[ -f "${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig/dvdread.pc" || -f "$
277277
else
278278
echo "[*] --disable-libdvdread"
279279
fi
280+
281+
282+
echo "----------------------"
283+
echo "[*] PKG_CONFIG_LIBDIR"
284+
280285
if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
281286
export PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR"
282287
fi
283288

284-
CC="$XCRUN_CC"
285-
286289
echo "export PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR}"
287-
export PKG_LIBS=$(xml2-config --libs)
288-
export PKG_CFLAGS=$(xml2-config --cflags)
290+
289291
# pkg-config --variable pc_path pkg-config
290292
# pkg-config --libs dav1d
291-
pkg-config --cflags --libs libbluray
293+
# pkg-config --cflags --libs libbluray
294+
292295
echo "----------------------"
293296
echo "[*] configure"
294297

@@ -306,7 +309,7 @@ if [[ -f "./config.h" ]]; then
306309
echo 'reuse configure'
307310
else
308311
echo
309-
echo "CC: $CC"
312+
echo "CC: $XCRUN_CC"
310313
echo
311314
echo "CFLAGS: $C_FLAGS"
312315
echo
@@ -316,18 +319,21 @@ else
316319
echo
317320
./configure \
318321
$CFG_FLAGS \
319-
--cc="$CC" \
322+
--cc="$XCRUN_CC" \
320323
--extra-cflags="$C_FLAGS" \
321324
--extra-cxxflags="$C_FLAGS" \
322325
--extra-ldflags="$LDFLAGS $FFMPEG_DEP_LIBS"
323326
fi
324327

325328
#----------------------
326329
echo "----------------------"
327-
echo "[*] compile $LIB_NAME"
328-
echo "----------------------"
330+
echo "[*] compile"
329331

330332
make
333+
334+
echo "----------------------"
335+
echo "[*] install"
336+
331337
cp config.* $XC_BUILD_PREFIX
332338
make install -j8 1>/dev/null
333339
mkdir -p $XC_BUILD_PREFIX/include/libffmpeg

0 commit comments

Comments
 (0)