...
 
Commits (131)
stages:
- build
.variables-debian-amd64: &variables-debian-amd64
_NAME: debian-amd64
.variables-win32: &variables-win32
_MACHINE: i686
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win32
.variables-win64: &variables-win64
_MACHINE: x86_64
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win64
.variables-win64-llvm: &variables-win64-llvm
_MACHINE: x86_64
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
.variables-macos: &variables-macos
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 17
_NAME: macosx-intel
_TRIPLET: x86_64-apple-darwin${VLC_FORCE_KERNELVERSION}
.docker-common:
stage: build
tags:
- docker
- amd64
- zorin
.nightly-common: &nightly-common
before_script:
- export _VLC_VERSION=`fgrep AC_INIT configure.ac | cut -d\[ -f 3 | cut -d- -f 1`
only:
refs:
- schedules
variables:
- $CI_PROJECT_NAMESPACE == 'thresh'
- $CI_PROJECT_NAME == 'vlc'
.win-continuous:
extends: .docker-common
except:
- schedules
script: |
set -x
mkdir -p contrib/contrib-${_NAME} && cd contrib/contrib-${_NAME}
curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2
cd ../../
extras/package/win32/build.sh -p -a ${_MACHINE}
.win32-continuous: &win32-continuous
extends: .win-continuous
image:
name: registry.videolan.org/vlc-debian-win32:20190410153151
entrypoint: ['bash', '-c', 'exec su -l jenkins -c bash']
variables: *variables-win32
.win64-continuous: &win64-continuous
extends: .win-continuous
image:
name: registry.videolan.org/vlc-debian-win64:20190410154352
entrypoint: ['bash', '-c', 'exec su -l jenkins -c bash']
variables: *variables-win64
.win-nightly:
<<: *nightly-common
extends: .docker-common
script: |
set -x
extras/package/win32/build.sh -l -c -a ${_MACHINE} -i n
cd ${_NAME}
ls -la
find . -maxdepth 1 -type f -name "vlc-*-dev*${_NAME}*" | xargs sha512sum | tee SHA512SUM
mv vlc-*-dev-${_NAME}.exe $(ls vlc-*-dev-${_NAME}.exe | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.msi $(ls vlc-*-dev-${_NAME}.msi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.7z $(ls vlc-*-dev-${_NAME}.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.zip $(ls vlc-*-dev-${_NAME}.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.xpi $(ls vlc-*-dev-${_NAME}.xpi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}-debug.7z $(ls vlc-*-dev-${_NAME}-debug.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}-debug.zip $(ls vlc-*-dev-${_NAME}-debug.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p ${_NAME}/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`/; cd ${_NAME}/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`; mput vlc-*.zip vlc-*.exe vlc-*.msi vlc-*.7z vlc-*.xpi ../contrib/vlc-contrib-*.tar.bz2 SHA512SUM"
.win32-nightly:
<<: *win32-continuous
extends: .win-nightly
.win64-nightly:
<<: *win64-continuous
extends: .win-nightly
win32:
extends: .win32-continuous
win64:
extends: .win64-continuous
win32-nightly:
extends: .win32-nightly
win64-nightly:
extends: .win64-nightly
win64-llvm-nightly:
extends: .win-nightly
image:
name: registry.videolan.org/vlc-debian-llvm-mingw:20190408173634
variables: *variables-win64-llvm
.debian-common:
extends: .docker-common
image:
name: registry.videolan.org/vlc-debian-unstable:20190410133343
entrypoint: ['bash', '-c', 'exec su -l jenkins -c bash']
variables: *variables-debian-amd64
before_script:
- export _NCPU=$(getconf _NPROCESSORS_ONLN)
debian-amd64:
extends: .debian-common
except:
- schedules
script: |
set -x
./bootstrap
./configure
make -j${_NCPU} -k || make -j1
make check || cat ./test-suite.log
debian-amd64-nightly:
<<: *nightly-common
extends: .debian-common
script: |
set -x
cd extras/tools && ./bootstrap && make -j${_NCPU} -k || make -j1
export PATH=`pwd`/build/bin:$PATH
cd ../../
cd contrib && mkdir native && cd native
../bootstrap --disable-srt --enable-matroska
make list PKGS_FOUND=
make -j${_NCPU} fetch PKGS_FOUND=
make -j${_NCPU} -k PKGS_FOUND= || make -j1 PKGS_FOUND=
cd ../../
./bootstrap
mkdir build && cd build
../configure
make -j${_NCPU} -k || make -j1
make check || cat ./test-suite.log
debian-amd64-nightly-source:
<<: *nightly-common
extends: .debian-common
script: |
set -x
./bootstrap
mkdir build && cd build
../configure
make -j${_NCPU}
VLC_TEST_TIMEOUT=60 make -j${_NCPU} distcheck VERBOSE=1
mv vlc-*.tar.xz $(ls vlc-*.tar.xz | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p source ;cd source;mput vlc-*.tar.xz"
snap-nightly:
<<: *nightly-common
extends: .docker-common
image:
name: registry.videolan.org/vlc-ubuntu-bionic:20190410145812
entrypoint: ['bash', '-c', 'exec su -l jenkins -c bash']
variables: *variables-debian-amd64
script: |
set -x
cd extras/package/snap
make -f package.mak snap
echo lftp -c "set dns:order inet; set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p snap ;cd snap;mput vlc_*.snap"
mkdir .snapcraft
echo $snapmacaroon | base64 -d -i > .snapcraft/snapcraft.cfg
echo snapcraft push --release edge vlc_*.snap
rm -rf .snapcraft
.macos-common:
stage: build
tags:
- macmini
- vbox
variables: *variables-macos
macos:
extends: .macos-common
except:
- schedules
script: |
set -x
mkdir -p contrib/contrib-${_TRIPLET} && cd contrib/contrib-${_TRIPLET}
curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2
cd ../../
mkdir build
cd build
../extras/package/macosx/build.sh
make check || /usr/bin/true
macos-nightly:
<<: *nightly-common
extends: .macos-common
script: |
set -x
mkdir build
cd build
../extras/package/macosx/build.sh -c -p
make check || /usr/bin/true
ls -la
find . -maxdepth 1 -type f -name "vlc-*-dev*${_NAME}*" | xargs sha512sum | tee SHA512SUM
mv vlc-*.dmg $(ls vlc-*.dmg | sed -E "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo /usr/local/bin/lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p macosx-intel/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`/; cd macosx-intel/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`; mput vlc-*.dmg; mput ../contrib/vlc-contrib-*.tar.bz2"
/* Compare strings while treating digits characters numerically.
Copyright (C) 1997, 2002, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jean-Franois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -18,6 +18,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdint.h>
#include <string.h>
#include <ctype.h>
......
......@@ -748,7 +748,7 @@ ac_cv_type_socklen_t,
ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no)])
AS_IF([test "$ac_cv_type_socklen_t" = no],
[AC_DEFINE(socklen_t, int)])
[AC_DEFINE(socklen_t, unsigned int)])
dnl Check for struct sockaddr_storage
AH_TEMPLATE(sockaddr_storage, [Define to `sockaddr' if <sys/socket.h> does not define.]) dnl ` (fix VIM syntax highlight
......@@ -4285,7 +4285,7 @@ dnl
AC_ARG_ENABLE([gnutls],
AS_HELP_STRING([--enable-gnutls], [GNU TLS TLS/SSL support (default enabled)]))
AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.3.6], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.5.0], [
VLC_ADD_PLUGIN([gnutls])
], [
AS_IF([test -n "${enable_gnutls}"], [
......
......@@ -29,9 +29,7 @@ endif
DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2)
BLURAY_CONF = --disable-examples \
--with-libxml2 \
--enable-udf \
--enable-bdjava
--with-libxml2
ifneq ($(WITH_FONTCONFIG), 0)
DEPS_bluray += fontconfig $(DEPS_fontconfig)
......
f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 glib-2.38.2.tar.xz
8184371aa5a8936ef86e578ee66307dadc351203ad0773c7669ab6d3f6bca49e7391ccafeb624d7bfe67f0d9aafe72799defee4660f254c3a3013c752e897e6c glib-2.60.0.tar.xz
# GLIB
GLIB_VERSION := 2.38
GLIB_MINOR_VERSION := 2.38.2
GLIB_VERSION := 2.60
GLIB_MINOR_VERSION := 2.60.0
GLIB_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB_VERSION)/glib-$(GLIB_MINOR_VERSION).tar.xz
ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),)
PKGS_FOUND += glib
endif
DEPS_glib = ffi $(DEPS_ffi)
DEPS_glib = ffi $(DEPS_ffi) iconv $(DEPS_iconv)
$(TARBALLS)/glib-$(GLIB_MINOR_VERSION).tar.xz:
$(call download_pkg,$(GLIB_URL),glib)
......@@ -19,7 +19,7 @@ glib: glib-$(GLIB_MINOR_VERSION).tar.xz .sum-glib
$(MOVE)
.glib: glib
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
cd $< && rm -rf ./build
cd $< && $(HOSTVARS_MESON) $(MESON) build -Diconv=gnu
cd $< && cd build && ninja install
touch $@
4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1 gnutls-3.6.6.tar.xz
c3c4178c8663e3d1207aaf771ceb43e7e75a9f11b4ea3a26fde9d04a23762b05bac8fe290b74d63b815a354b79fc3557cfc218c196e1f80eb1fbce762948a926 gnutls-3.6.7.1.tar.xz
......@@ -5,7 +5,7 @@ diff -ru gnutls-3.5.16/lib/gnutls.pc.in gnutls-3.5.16.patched/lib/gnutls.pc.in
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
+Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
......@@ -15,7 +15,7 @@
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
+Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ -lcrypt32 @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ -lcrypt32 @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--- gnutls/lib/x509/ip.c.ntop_win32 2019-03-05 11:21:25.250954200 +0100
+++ gnutls/lib/x509/ip.c 2019-03-05 11:21:31.651380300 +0100
@@ -26,8 +26,10 @@
#include <gnutls/x509.h>
#ifdef HAVE_INET_NTOP
+#ifndef _WIN32
# include <arpa/inet.h>
#endif
+#endif
/*-
* _gnutls_mask_to_prefix:
# GnuTLS
GNUTLS_VERSION := 3.6.6
GNUTLS_VERSION := 3.6.7.1
GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz
ifdef BUILD_NETWORK
......@@ -8,7 +8,7 @@ ifndef HAVE_DARWIN_OS
PKGS += gnutls
endif
endif
ifeq ($(call need_pkg,"gnutls >= 3.3.6"),)
ifeq ($(call need_pkg,"gnutls >= 3.5.0"),)
PKGS_FOUND += gnutls
endif
......@@ -17,12 +17,13 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
.sum-gnutls: gnutls-$(GNUTLS_VERSION).tar.xz
# gnutls 3.6.7.1 unpacks into a dir named 3.6.7
gnutls: UNPACK_DIR=gnutls-3.6.7
gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(UNPACK)
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
$(APPLY) $(SRC)/gnutls/gnutls-winstore-ntop.patch
endif
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
......
......@@ -242,14 +242,14 @@ ifeq ($(shell git --version >/dev/null 2>&1 || echo FAIL),)
GIT = git
endif
endif
GIT ?= $(error git not found!)
GIT ?= $(error git not found)
ifndef SVN
ifeq ($(shell svn --version >/dev/null 2>&1 || echo FAIL),)
SVN = svn
endif
endif
SVN ?= $(error subversion client (svn) not found!)
SVN ?= $(error subversion client (svn) not found)
ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
download = curl -f -L -- "$(1)" > "$@"
......@@ -264,7 +264,7 @@ download = (rm -f $@.tmp && \
touch $@.tmp && \
mv $@.tmp $@)
else
download = $(error Neither curl nor wget found!)
download = $(error Neither curl nor wget found)
endif
download_pkg = $(call download,$(CONTRIB_VIDEOLAN)/$(2)/$(lastword $(subst /, ,$(@)))) || \
......@@ -273,7 +273,7 @@ download_pkg = $(call download,$(CONTRIB_VIDEOLAN)/$(2)/$(lastword $(subst /, ,$
ifeq ($(shell which xz >/dev/null 2>&1 || echo FAIL),)
XZ = xz
else
XZ ?= $(error XZ (LZMA) compressor not found!)
XZ ?= $(error XZ (LZMA) compressor not found)
endif
ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
......@@ -283,13 +283,13 @@ SHA512SUM = shasum -a 512 --check
else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
SHA512SUM = openssl dgst -sha512
else
SHA512SUM = $(error SHA-512 checksumming not found!)
SHA512SUM = $(error SHA-512 checksumming not found)
endif
ifeq ($(shell protoc --version >/dev/null 2>&1 || echo FAIL),)
PROTOC = protoc
else
PROTOC ?= $(error Protobuf compiler (protoc) not found!)
PROTOC ?= $(error Protobuf compiler (protoc) not found)
endif
#
......
438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518 opus-1.3.tar.gz
6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd opus-1.3.1.tar.gz
# opus
OPUS_VERSION := 1.3
OPUS_VERSION := 1.3.1
OPUS_URL := https://archive.mozilla.org/pub/opus/opus-$(OPUS_VERSION).tar.gz
......
6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613 qt-5.12.2.tar.xz
6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613 qtbase-everywhere-src-5.12.2.tar.xz
......@@ -16,18 +16,17 @@ DEPS_qt += wine-headers fxc2 $(DEPS_fxc2)
endif
endif
ifeq ($(call need_pkg,"Qt5Core Qt5Gui Qt5Widgets"),)
ifeq ($(call need_pkg,"Qt5Core >= 5.11 Qt5Gui Qt5Widgets"),)
PKGS_FOUND += qt
endif
$(TARBALLS)/qt-$(QT_VERSION_FULL).tar.xz:
$(TARBALLS)/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz:
$(call download_pkg,$(QT_URL),qt)
.sum-qt: qt-$(QT_VERSION_FULL).tar.xz
.sum-qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
qt: qt-$(QT_VERSION_FULL).tar.xz .sum-qt
qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
$(UNPACK)
mv qtbase-everywhere-src-$(QT_VERSION_FULL) qt-$(QT_VERSION_FULL)
ifdef HAVE_WIN32
$(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch
$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
......
0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0 qtdeclarative-5.12.2.tar.xz
0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0 qtdeclarative-everywhere-src-5.12.2.tar.xz
......@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Quick"),)
PKGS_FOUND += qtdeclarative
endif
$(TARBALLS)/qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz:
$(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
$(call download_pkg,$(QTDECLARATIVE_URL),qt)
.sum-qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz
.sum-qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
mv qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION) qtdeclarative-$(QTDECLARATIVE_VERSION)
$(MOVE)
.qtdeclarative: qtdeclarative
......
13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af qtgraphicaleffects-5.12.2.tar.xz
13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af qtgraphicaleffects-everywhere-src-5.12.2.tar.xz
......@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5QuickControls2"),)
PKGS_FOUND += qtgraphicaleffects
endif
$(TARBALLS)/qtgraphicaleffects-$(QTGE_VERSION).tar.xz:
$(TARBALLS)/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz:
$(call download_pkg,$(QTGE_URL),qt)
.sum-qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz
.sum-qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
$(UNPACK)
mv qtgraphicaleffects-everywhere-src-$(QTGE_VERSION) qtgraphicaleffects-$(QTGE_VERSION)
$(MOVE)
.qtgraphicaleffects: qtgraphicaleffects
......
ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735 qtquickcontrols2-5.12.2.tar.xz
ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735 qtquickcontrols2-everywhere-src-5.12.2.tar.xz
......@@ -15,14 +15,13 @@ endif
DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative)
$(TARBALLS)/qtquickcontrols2-$(QTQC2_VERSION).tar.xz:
$(TARBALLS)/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz:
$(call download_pkg,$(QTQC2_URL),qt)
.sum-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz
qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
$(UNPACK)
mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION)
$(MOVE)
.qtquickcontrols2: qtquickcontrols2
......
6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249 qtsvg-5.12.2.tar.xz
6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249 qtsvg-everywhere-src-5.12.2.tar.xz
......@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Svg"),)
PKGS_FOUND += qtsvg
endif
$(TARBALLS)/qtsvg-$(QTSVG_VERSION).tar.xz:
$(TARBALLS)/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz:
$(call download_pkg,$(QTSVG_URL),qt)
.sum-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz
.sum-qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
$(UNPACK)
mv qtsvg-everywhere-src-$(QTSVG_VERSION) qtsvg-$(QTSVG_VERSION)
$(APPLY) $(SRC)/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
$(MOVE)
......
--- a/include/d3d9.h 2016-04-17 11:41:20.676521300 +0300
+++ b/include/d3d9.h 2016-04-17 12:12:13.637219200 +0300
@@ -2185,6 +2185,42 @@ __CRT_UUID_DECL(IDirect3DDevice9Ex,
#define IDirect3DDevice9Ex_GetDisplayModeEx(p,a,b,c) (p)->GetDisplayModeEx(a,b,c)
#endif
+/*****************************************************************************
+ * IDirect3D9ExOverlayExtension interface
+ */
+#define INTERFACE IDirect3D9ExOverlayExtension
+DECLARE_INTERFACE_(IDirect3D9ExOverlayExtension,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3D9ExOverlayExtension methods ***/
+ STDMETHOD(CheckDeviceOverlayType)(THIS_ UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight,
+ D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX* pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS* pOverlayCaps) PURE;
+};
+#undef INTERFACE
+
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IDirect3D9ExOverlayExtension, 0x187aeb13, 0xaaf5, 0x4c59, 0x87, 0x6d, 0xe0, 0x59, 0x8, 0x8c, 0xd, 0xf8);
+#endif
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3D9ExOverlayExtension_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3D9ExOverlayExtension ***/
+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h)
+#else
+/*** IUnknown methods ***/
+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->AddRef()
+#define IDirect3D9ExOverlayExtension_Release(p) (p)->Release()
+/*** IDirect3D9ExOverlayExtension ***/
+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->CheckDeviceOverlayType(a,b,c,d,e,f,g,h)
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
--- a/include/d3d9caps.h 2016-04-17 11:41:20.681535900 +0300
+++ b/include/d3d9caps.h 2016-04-17 11:49:14.065736000 +0300
@@ -399,6 +399,14 @@ typedef struct _D3DCAPS9 {
} D3DCAPS9;
+typedef struct _D3DOVERLAYCAPS {
+ UINT Caps;
+ UINT MaxOverlayDisplayWidth;
+ UINT MaxOverlayDisplayHeight;
+
+} D3DOVERLAYCAPS;
+
+
#ifdef __i386__
#include <poppack.h>
#endif
......@@ -28,8 +28,6 @@ $(TARBALLS)/wine-$(WINE_VERSION).tar.xz:
wine-headers: wine-$(WINE_VERSION).tar.xz .sum-wine-headers
$(UNPACK)
$(APPLY) $(SRC)/wine-headers/d3d9caps.patch
$(APPLY) $(SRC)/wine-headers/d3d9.patch
$(APPLY) $(SRC)/wine-headers/dxva2api.patch
$(APPLY) $(SRC)/wine-headers/dxgidebug.patch
$(APPLY) $(SRC)/wine-headers/processor_format.patch
......
......@@ -15,19 +15,19 @@ pseudo-bundle:
VLC.app: install
rm -Rf $@
## Copy Contents
cp -R $(prefix)/share/macosx/ $@
cp -R "$(datadir)/macosx/" $@
## Copy .strings file and .nib files
cp -R $(top_builddir)/modules/gui/macosx/UI $@/Contents/Resources/Base.lproj
cp -R "$(top_builddir)/modules/gui/macosx/UI" $@/Contents/Resources/Base.lproj
## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
cp -R "$(top_builddir)/share/macosx/Info.plist" $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
## Create Frameworks dir and copy required ones
mkdir -p $@/Contents/Frameworks
if HAVE_SPARKLE
cp -R $(CONTRIB_DIR)/Frameworks/Sparkle.framework $@/Contents/Frameworks
cp -R "$(CONTRIB_DIR)/Frameworks/Sparkle.framework" $@/Contents/Frameworks
endif
if HAVE_BREAKPAD
cp -R $(CONTRIB_DIR)/Frameworks/Breakpad.framework $@/Contents/Frameworks
cp -R "$(CONTRIB_DIR)/Frameworks/Breakpad.framework" $@/Contents/Frameworks
endif
mkdir -p $@/Contents/Resources/share/
mkdir -p $@/Contents/MacOS/
......@@ -37,19 +37,19 @@ if BUILD_LUA
cp -r "$(pkglibexecdir)/lua" $@/Contents/Frameworks/
endif
## HRTFs
cp -r $(srcdir)/share/hrtfs $@/Contents/Resources/share/
cp -r "$(srcdir)/share/hrtfs" $@/Contents/Resources/share/
## Copy translations
-cp -a "$(prefix)/share/locale" $@/Contents/Resources/share/
-cp -a "$(datadir)/locale" $@/Contents/Resources/share/
printf "APPLVLC#" >| $@/Contents/PkgInfo
## Copy libs
find $(prefix)/lib -name 'libvlc*.dylib' -maxdepth 1 -exec cp -a {} $@/Contents/Frameworks \;
cp -a "$(libdir)"/libvlc*.dylib $@/Contents/Frameworks/
## Copy plugins
mkdir -p $@/Contents/Frameworks/plugins
find $(prefix)/lib/vlc/plugins -name 'lib*_plugin.dylib' -maxdepth 2 -exec cp -a {} $@/Contents/Frameworks/plugins \;
find "$(pkglibdir)/plugins" -name 'lib*_plugin.dylib' -maxdepth 2 -exec cp -a {} $@/Contents/Frameworks/plugins \;
## Copy libbluray jar
-cp -a $(CONTRIB_DIR)/share/java/libbluray*.jar $@/Contents/Frameworks/plugins/
-cp -a "$(CONTRIB_DIR)"/share/java/libbluray*.jar $@/Contents/Frameworks/plugins/
## Install binary
cp $(prefix)/bin/vlc $@/Contents/MacOS/VLC
cp "$(prefix)/bin/vlc" $@/Contents/MacOS/VLC
install_name_tool -rpath "$(libdir)" "@executable_path/../Frameworks/" $@/Contents/MacOS/VLC
## Generate plugin cache
VLC_LIB_PATH="$@/Contents/Frameworks" bin/vlc-cache-gen $@/Contents/Frameworks/plugins
......
......@@ -154,6 +154,12 @@ parts:
- bison
- flex
- libvulkan-dev
- qtdeclarative5-dev
- qtquickcontrols2-5-dev
- qml-module-qtquick-controls2
- qml-module-qtquick-layouts
- qml-module-qtquick-templates2
- qml-module-qtgraphicaleffects
stage-packages:
- fonts-freefont-ttf
- dbus-x11
......@@ -212,6 +218,10 @@ parts:
- mesa-vulkan-drivers
- libvulkan-dev
- openjdk-8-jdk
- qml-module-qtquick-controls2
- qml-module-qtquick-layouts
- qml-module-qtquick-templates2
- qml-module-qtgraphicaleffects
filesets:
exclusion:
- "-usr/lib/*/cmake/*"
......
......@@ -31,4 +31,7 @@ export KDE_FORK_SLAVES=1
## Neon PATCH! make KIO look for slaves in a dynamic location depending on $SNAP
export KF5_LIBEXEC_DIR=$SNAP/usr/lib/$ARCH/libexec/kf5
# set QML2 import path for Qt UI
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH:$SNAP/usr/lib/x86_64-linux-gnu/qt5/qml/"
exec $SNAP/usr/bin/vlc --config=$SNAP_USER_COMMON/vlcrc "$@"
......@@ -106,7 +106,7 @@ typedef struct addons_finder_t addons_finder_t;
typedef struct addons_finder_sys_t addons_finder_sys_t;
struct addons_finder_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
int ( * pf_find )( addons_finder_t * );
int ( * pf_retrieve )( addons_finder_t *, addon_entry_t * );
......@@ -120,7 +120,7 @@ typedef struct addons_storage_t addons_storage_t;
typedef struct addons_storage_sys_t addons_storage_sys_t;
struct addons_storage_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
int ( * pf_install )( addons_storage_t *, addon_entry_t * );
int ( * pf_remove )( addons_storage_t *, addon_entry_t * );
......
......@@ -137,7 +137,7 @@ struct vlc_audio_output_events {
**/
struct audio_output
{
struct vlc_common_members obj;
struct vlc_object_t obj;
void *sys; /**< Private data for callbacks */
......
......@@ -43,7 +43,7 @@ typedef struct audio_volume audio_volume_t;
*/
struct audio_volume
{
struct vlc_common_members obj;
struct vlc_object_t obj;
vlc_fourcc_t format; /**< Audio samples format */
void (*amplify)(audio_volume_t *, block_t *, float); /**< Amplifier */
......
......@@ -98,7 +98,7 @@ struct decoder_owner_callbacks
*/
struct decoder_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t * p_module;
......@@ -220,7 +220,7 @@ struct decoder_cc_desc_t
struct encoder_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t * p_module;
......@@ -498,7 +498,7 @@ enum vlc_decoder_device_type
*/
typedef struct vlc_decoder_device
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/** Private context that could be used by the "decoder device" module
* implementation */
......
......@@ -53,7 +53,7 @@
/* demux_meta_t is returned by "meta reader" module to the demuxer */
typedef struct demux_meta_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
input_item_t *p_item; /***< the input item that is being read */
vlc_meta_t *p_meta; /**< meta data */
......
......@@ -46,9 +46,9 @@
* (see src/misc/variables.c).
*
* It has the following advantages over Variable based Callback:
* - No need to implement the whole vlc_common_members in the object,
* - No need to implement the whole vlc_object_t in the object,
* thus it reduce it size. This is especially true for input_item_t which
* doesn't have vlc_common_members. This is the first reason of existence of
* doesn't have vlc_object_t. This is the first reason of existence of
* this implementation.
* - Libvlc can easily be based upon that.
* - Existing event are clearly declared (in include/vlc_events.h)
......@@ -56,7 +56,7 @@
*
**** Example usage
*
* (vlc_cool_object_t doesn't need to have the vlc_common_members.)
* (vlc_cool_object_t doesn't need to have the vlc_object_t.)
*
* struct vlc_cool_object_t
* {
......
......@@ -51,7 +51,7 @@ typedef struct extension_t {
/** Extensions manager object */
struct extensions_manager_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module; /**< Extensions manager module */
extensions_manager_sys_t *p_sys; /**< Reserved for the module */
......
......@@ -65,7 +65,7 @@ struct vlc_mouse_t;
*/
struct filter_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t * p_module;
......
......@@ -68,7 +68,7 @@ static inline void fingerprint_request_Delete( fingerprint_request_t *p_f )
struct fingerprinter_thread_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Specific interfaces */
fingerprinter_sys_t * p_sys;
......
......@@ -42,7 +42,7 @@ enum vlc_inhibit_flags
struct vlc_inhibit
{
struct vlc_common_members obj;
struct vlc_object_t obj;
vlc_inhibit_sys_t *p_sys;
void (*inhibit) (vlc_inhibit_t *, unsigned flags);
......
......@@ -224,7 +224,7 @@ typedef struct input_resource_t input_resource_t;
*/
struct input_thread_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
};
/**
......
......@@ -46,7 +46,7 @@ typedef struct intf_sys_t intf_sys_t;
/** Describe all interface-specific data of the interface thread */
typedef struct intf_thread_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */
......
......@@ -294,7 +294,7 @@ vlc_keystore_release_entry(vlc_keystore_entry *p_entry)
typedef struct vlc_keystore_sys vlc_keystore_sys;
struct vlc_keystore
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module;
vlc_keystore_sys *p_sys;
......
......@@ -664,7 +664,7 @@ typedef struct vlc_medialibrary_callbacks_t
struct vlc_medialibrary_module_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module;
......
......@@ -98,7 +98,7 @@ VLC_API const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type )
typedef struct meta_export_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
input_item_t *p_item;
const char *psz_file;
} meta_export_t;
......
......@@ -30,7 +30,7 @@ typedef enum meta_fetcher_scope_t
typedef struct meta_fetcher_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
input_item_t *p_item;
meta_fetcher_scope_t e_scope;
} meta_fetcher_t;
......
......@@ -202,6 +202,22 @@ VLC_API int vlc_close(int);
/** @} */
#ifdef _WIN32
static inline int vlc_getsockopt(int s, int level, int name,
void *val, socklen_t *len)
{
return getsockopt(s, level, name, (char *)val, len);
}
#define getsockopt vlc_getsockopt
static inline int vlc_setsockopt(int s, int level, int name,
const void *val, socklen_t len)
{
return setsockopt(s, level, name, (const char *)val, len);
}
#define setsockopt vlc_setsockopt
#endif
/* Portable network names/addresses resolution layer */
#define NI_MAXNUMERICHOST 64
......
......@@ -29,6 +29,8 @@
*/
struct vlc_logger;
struct vlc_object_internals;
struct vlc_object_marker;
/**
* VLC object common members
......@@ -37,9 +39,13 @@ struct vlc_logger;
* Object also have private properties maintained by the core, see
* \ref vlc_object_internals_t
*/
struct vlc_common_members
struct vlc_object_t
{
struct vlc_logger *logger;
union {
struct vlc_object_internals *priv;
struct vlc_object_marker *obj;
};
bool no_interact;
......@@ -62,25 +68,51 @@ struct vlc_common_members
#if !defined(__cplusplus)
# define VLC_OBJECT(x) \
_Generic((x)->obj, \
struct vlc_common_members: (vlc_object_t *)(x) \
struct vlc_object_marker *: (x), \
default: (&((x)->obj)) \
)
# define vlc_object_cast(t)
#else
# define VLC_OBJECT(x) ((vlc_object_t *)(x))
static inline vlc_object_t *VLC_OBJECT(vlc_object_t *o)
{
return o;
}
# define vlc_object_cast(t) \
struct t; \
static inline struct vlc_object_t *VLC_OBJECT(struct t *d) \
{ \
return (struct vlc_object_t *)d; \
}
#endif
/*****************************************************************************
* The vlc_object_t type. Yes, it's that simple :-)
*****************************************************************************/
/** The main vlc_object_t structure */
struct vlc_object_t
{
struct vlc_common_members obj;
};
vlc_object_cast(libvlc_int_t)
vlc_object_cast(intf_thread_t)
vlc_object_cast(vlc_player_t)
vlc_object_cast(playlist_t)
vlc_object_cast(input_thread_t)
vlc_object_cast(stream_t)
vlc_object_cast(decoder_t)
vlc_object_cast(filter_t)
vlc_object_cast(audio_output)
vlc_object_cast(vout_thread_t)
vlc_object_cast(vout_display_t)
vlc_object_cast(vout_window_t)
vlc_object_cast(sout_instance_t)
vlc_object_cast(sout_stream_t)
vlc_object_cast(sout_access_out_t)
vlc_object_cast(extensions_manager_t)
vlc_object_cast(fingerprinter_thread_t)
vlc_object_cast(demux_meta_t)
vlc_object_cast(xml_t)
vlc_object_cast(services_discovery_t)
vlc_object_cast(vlc_renderer_discovery_t)
vlc_object_cast(vlc_medialibrary_module_t)
/* The root object */
struct libvlc_int_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
};
/**
......@@ -91,7 +123,6 @@ struct libvlc_int_t
* @return the new object, or NULL on error.
*/
VLC_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char * ) VLC_USED VLC_DEPRECATED;
/**
* Drops the strong reference to an object.
......@@ -127,7 +158,7 @@ VLC_API vlc_object_t *vlc_object_parent(vlc_object_t *obj) VLC_USED;
static inline struct vlc_logger *vlc_object_logger(vlc_object_t *obj)
{
return obj->obj.logger;
return obj->logger;
}
#define vlc_object_logger(o) vlc_object_logger(VLC_OBJECT(o))
......
......@@ -40,7 +40,7 @@ typedef struct vlc_gl_t vlc_gl_t;
struct vlc_gl_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
struct vout_window_t *surface;
module_t *module;
......
......@@ -61,7 +61,7 @@ vlc_playlist_view_Get(struct vlc_playlist_view *view, size_t index);
*/
struct vlc_playlist_export
{
struct vlc_common_members obj;
struct vlc_object_t obj;
char *base_url;
FILE *file;
struct vlc_playlist_view *playlist_view;
......
......@@ -111,7 +111,7 @@ struct intf_thread_t;
/** Helper structure to export to file part of the playlist */
typedef struct playlist_export_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
char *base_url;
FILE *p_file;
playlist_item_t *p_root;
......@@ -145,7 +145,7 @@ typedef enum
/** Structure containing information about the playlist */
struct playlist_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
playlist_item_array_t items; /**< Arrays of items */
......
......@@ -38,7 +38,7 @@ void *vlc_probe (vlc_object_t *, const char *, size_t *);
struct vlc_probe_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
void *list;
size_t count;
......
......@@ -163,7 +163,7 @@ struct vlc_renderer_discovery_owner
struct vlc_renderer_discovery_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t * p_module;
struct vlc_renderer_discovery_owner owner;
......
......@@ -57,7 +57,7 @@ struct services_discovery_owner_t
*/
struct services_discovery_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t * p_module; /**< Loaded module */
char *psz_name; /**< Main name of the SD */
......
......@@ -46,7 +46,7 @@ extern "C" {
* invalid unsynchronized access) */
struct sout_instance_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
char *psz_sout;
......@@ -67,7 +67,7 @@ struct sout_instance_t
/** Stream output access_output */
struct sout_access_out_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module;
char *psz_access;
......@@ -115,7 +115,7 @@ static inline bool sout_AccessOutCanControlPace( sout_access_out_t *p_ao )
/** Muxer structure */
struct sout_mux_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module;
sout_instance_t *p_sout;
......@@ -193,7 +193,7 @@ enum sout_stream_query_e {
struct sout_stream_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
module_t *p_module;
sout_instance_t *p_sout;
......
......@@ -45,7 +45,7 @@ typedef struct spu_private_t spu_private_t;
*/
struct spu_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
spu_private_t *p;
};
......
......@@ -44,7 +44,7 @@ extern "C" {
struct stream_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
char *psz_name;
char *psz_url; /**< Full URL or MRL (can be NULL) */
......
......@@ -48,7 +48,7 @@ extern "C" {
**/
typedef struct stream_extractor_t {
struct vlc_common_members obj;
struct vlc_object_t obj;
/**
* \name Callbacks for entity extraction
......@@ -71,7 +71,7 @@ typedef struct stream_extractor_t {
} stream_extractor_t;
typedef struct stream_directory_t {
struct vlc_common_members obj;
struct vlc_object_t obj;
/**
* \name Callbacks for stream directories
......
......@@ -138,7 +138,7 @@ struct vlc_tls_operations
*/
typedef struct vlc_tls_client
{
struct vlc_common_members obj;
struct vlc_object_t obj;
const struct vlc_tls_client_operations *ops;
void *sys;
} vlc_tls_client_t;
......@@ -216,7 +216,7 @@ VLC_API vlc_tls_t *vlc_tls_ClientSessionCreate(vlc_tls_client_t *creds,
*/
typedef struct vlc_tls_server
{
struct vlc_common_members obj;
struct vlc_object_t obj;
const struct vlc_tls_server_operations *ops;
void *sys;
......
......@@ -55,7 +55,7 @@ typedef struct
*/
struct video_splitter_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t *p_module;
......
......@@ -34,7 +34,7 @@
struct vod_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t *p_module;
......
......@@ -57,7 +57,7 @@ typedef struct vout_thread_sys_t vout_thread_sys_t;
* structure.
*/
struct vout_thread_t {
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Private vout_thread data */
vout_thread_sys_t *p;
......
......@@ -217,7 +217,7 @@ typedef int (*vout_display_open_cb)(vout_display_t *vd,
typedef int (*vout_display_close_cb)(vout_display_t *vd);
struct vout_display_t {
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module */
module_t *module;
......
......@@ -333,7 +333,7 @@ struct vout_window_operations {
* Finally, it must support some control requests such as for fullscreen mode.
*/
typedef struct vout_window_t {
struct vlc_common_members obj;
struct vlc_object_t obj;
/**
* Window handle type
......@@ -575,23 +575,14 @@ static inline void vout_window_ReportState(vout_window_t *window,
* This notifies the owner of the window that the window is windowed, i.e. not
* in full screen mode.
*/
static inline void vout_window_ReportWindowed(vout_window_t *window)
{
if (window->owner.cbs->windowed != NULL)
window->owner.cbs->windowed(window);
}
VLC_API void vout_window_ReportWindowed(vout_window_t *wnd);
/**
* Reports that the window is in full screen.
*
* \param id fullscreen output nul-terminated identifier, NULL for default
*/
static inline void vout_window_ReportFullscreen(vout_window_t *window,
const char *id)
{
if (window->owner.cbs->fullscreened != NULL)
window->owner.cbs->fullscreened(window, id);
}
VLC_API void vout_window_ReportFullscreen(vout_window_t *wnd, const char *id);
static inline void vout_window_SendMouseEvent(vout_window_t *window,
const vout_window_mouse_event_t *mouse)
......
......@@ -35,7 +35,7 @@ extern "C" {
struct xml_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
/* Module properties */
module_t *p_module;
......@@ -64,7 +64,7 @@ static inline void xml_CatalogAdd( xml_t *xml, const char *type,
struct xml_reader_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
void *p_sys;
stream_t *p_stream;
......
......@@ -37,7 +37,7 @@
struct libvlc_media_player_t
{
struct vlc_common_members obj;
struct vlc_object_t obj;
int i_refcount;
vlc_mutex_t object_lock;
......
......@@ -2219,7 +2219,6 @@ static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph,
{
int i_channel, i_country, i_input, i_amtuner_mode;
long l_modes = 0;
unsigned i_frequency;
ComPtr<IAMTVTuner> p_TV;
HRESULT hr;
......