Changeset 40094


Ignore:
Timestamp:
Feb 25, 2017, 9:51:27 PM (3 years ago)
Author:
obi
Message:

tithek add yoztube-dl support

Location:
titan
Files:
2523 added
77 edited

Legend:

Unmodified
Added
Removed
  • titan/mediathek/localhoster/hoster.sh

    r40086 r40094  
    188188{
    189189        echo "$INPUT"
     190}
     191
     192youtube_dl()
     193{
     194        $BIN $CMD/lib/youtube_dl/__main__.py --no-check-certificate -g "$INPUT"
    190195}
    191196
     
    217222        esac
    218223fi
     224
     225if [ "$TYPE" == "youtube_dl" ];then
     226        case $hoster in
     227                *) youtube_dl $INPUT;;
     228        esac
     229fi
  • titan/mediathek/localhoster/lib/python2.7/LICENSE.txt

    r39001 r40094  
    7575provided, however, that PSF's License Agreement and PSF's notice of copyright,
    7676i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    77 2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained
    78 in Python alone or in any derivative version prepared by Licensee.
     772011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved"
     78are retained in Python alone or in any derivative version prepared by Licensee.
    7979
    80803. In the event Licensee prepares a derivative work that is based on
  • titan/mediathek/localhoster/lib/python2.7/config/Makefile

    r39001 r40094  
    2222# === Variables set by makesetup ===
    2323
    24 MODOBJS=          Modules/threadmodule.o  Modules/signalmodule.o  Modules/posixmodule.o  Modules/errnomodule.o  Modules/pwdmodule.o  Modules/_sre.o  Modules/_codecsmodule.o  Modules/_weakref.o  Modules/zipimport.o  Modules/symtablemodule.o  Modules/xxsubtype.o
     24MODOBJS=          Modules/threadmodule.o  Modules/signalmodule.o  Modules/posixmodule.o  Modules/errnomodule.o  Modules/pwdmodule.o  Modules/_sre.o  Modules/_codecsmodule.o  Modules/_weakref.o  Modules/zipimport.o  Modules/symtablemodule.o  Modules/md5module.o Modules/md5.o  Modules/xxsubtype.o
    2525MODLIBS=        $(LOCALMODLIBS) $(BASEMODLIBS)
    2626
    2727# === Variables set by configure
    2828VERSION=        2.7
    29 srcdir=         .
    30 
    31 abs_srcdir=     /home/bonkel/HDMU-BUILD/SH4_NEW/cdk/python-2.7.9
    32 abs_builddir=   /home/bonkel/HDMU-BUILD/SH4_NEW/cdk/python-2.7.9
    33 build=          x86_64-unknown-linux-gnu
    34 host=           sh4-unknown-linux-gnu
    35 
    36 CC=             sh4-linux-gcc -pthread
    37 CXX=            sh4-linux-c++
     29srcdir=         ../Python-2.7.11
     30VPATH=          ../Python-2.7.11
     31abs_srcdir=     /home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/build/../Python-2.7.11
     32abs_builddir=   /home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/build
     33build=          i686-pc-linux-gnu
     34host=           arm-oe-linux-gnueabi
     35
     36CC=             arm-oe-linux-gnueabi-gcc  -march=armv7ve -mfpu=neon-vfpv4  -mfloat-abi=hard -mcpu=cortex-a15 --sysroot=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900 -pthread
     37CXX=            arm-oe-linux-gnueabi-g++  -march=armv7ve -mfpu=neon-vfpv4  -mfloat-abi=hard -mcpu=cortex-a15 --sysroot=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900
    3838MAINCC=         $(CC)
    3939LINKCC=         $(PURIFY) $(MAINCC)
    40 AR=             sh4-linux-ar
    41 RANLIB=         sh4-linux-ranlib
     40AR=             arm-oe-linux-gnueabi-ar
     41RANLIB=         arm-oe-linux-gnueabi-ranlib
    4242SVNVERSION=     svnversion $(srcdir)
    4343HGVERSION=     
    4444HGTAG=         
    4545HGBRANCH=       
     46PGO_PROF_GEN_FLAG=-fprofile-generate
     47PGO_PROF_USE_FLAG=-fprofile-use -fprofile-correction
     48LLVM_PROF_MERGER=true
     49LLVM_PROF_FILE=
     50LLVM_PROF_ERR=no
    4651
    4752GNULD=          yes
     
    6873
    6974# Compiler options
    70 OPT=            -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes
     75OPT=            -DNDEBUG -g -O3 -Wall -Wstrict-prototypes
    7176BASECFLAGS=      -fno-strict-aliasing
    72 CFLAGS=         $(BASECFLAGS) -g -O2 $(OPT) $(EXTRA_CFLAGS)
     77CFLAGS=         $(BASECFLAGS)  -Os -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/build=/usr/src/python -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/Python-2.7.11=/usr/src/python -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/i686-linux= -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900= $(OPT) $(EXTRA_CFLAGS)
    7378# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
    7479# be able to build extension modules using the directories specified in the
    7580# environment variables
    7681CPPFLAGS=       -I. -IInclude -I$(srcdir)/Include
    77 LDFLAGS=       
     82LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -L. -L/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib
    7883LDLAST=         
    7984SGI_ABI=       
     
    8994# Machine-dependent subdirectories
    9095MACHDEP=        linux2
     96LIB=            lib
    9197
    9298# Multiarch directory (may be empty)
     
    97103
    98104# Install prefix for architecture-dependent files
    99 exec_prefix=    ${prefix}
     105exec_prefix=    /usr
    100106
    101107# Install prefix for data files
     
    103109
    104110# Expanded directories
    105 BINDIR=         ${exec_prefix}/bin
    106 LIBDIR=         ${exec_prefix}/lib
    107 MANDIR=         ${datarootdir}/man
    108 INCLUDEDIR=     ${prefix}/include
    109 CONFINCLUDEDIR= $(exec_prefix)/include
     111BINDIR=         /usr/bin
     112LIBDIR=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib
     113MANDIR=         /usr/share/man
     114INCLUDE=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/include
     115CONFINCLUDE=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/include
    110116SCRIPTDIR=      $(prefix)/lib
    111117
     
    144150
    145151# Environment to run shared python without installed libraries
    146 RUNSHARED=       
     152RUNSHARED=
    147153
    148154# ensurepip options
     
    156162
    157163# configure script arguments
    158 CONFIG_ARGS=     '--build=x86_64-unknown-linux-gnu' '--host=sh4-linux' '--target=sh4-linux' '--prefix=/usr' '--sysconfdir=/etc' '--enable-shared' '--enable-ipv6' '--with-threads' '--with-pymalloc' '--with-signal-module' '--with-wctype-functions' 'ac_sys_system=Linux' 'ac_sys_release=2' 'ac_cv_file__dev_ptmx=no' 'ac_cv_file__dev_ptc=no' 'ac_cv_no_strict_aliasing_ok=yes' 'ac_cv_pthread=yes' 'ac_cv_cxx_thread=yes' 'ac_cv_sizeof_off_t=8' 'ac_cv_have_chflags=no' 'ac_cv_have_lchflags=no' 'ac_cv_py_format_size_t=yes' 'ac_cv_broken_sem_getvalue=no' 'HOSTPYTHON=/home/bonkel/HDMU-BUILD/SH4_NEW/tufsbox/host/bin/python' 'build_alias=x86_64-unknown-linux-gnu' 'host_alias=sh4-linux' 'target_alias=sh4-linux'
     164CONFIG_ARGS=     '--build=i686-linux' '--host=arm-oe-linux-gnueabi' '--target=arm-oe-linux-gnueabi' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib' '--includedir=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/include' '--oldincludedir=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' '--with-libtool-sysroot=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900' '--with-system-ffi' '--with-threads' '--with-pymalloc' '--without-cxx-main' '--with-signal-module' '--enable-shared' '--enable-ipv6=yes' 'ac_cv_header_bluetooth_bluetooth_h=no' 'ac_cv_header_bluetooth_h=no' 'ac_cv_file__dev_ptmx=yes' 'ac_cv_file__dev_ptc=no' 'ac_cv_no_strict_aliasing_ok=yes' 'ac_cv_pthread=yes' 'ac_cv_cxx_thread=yes' 'ac_cv_sizeof_off_t=8' 'build_alias=i686-linux' 'host_alias=arm-oe-linux-gnueabi' 'target_alias=arm-oe-linux-gnueabi' 'CC=arm-oe-linux-gnueabi-gcc  -march=armv7ve -mfpu=neon-vfpv4  -mfloat-abi=hard -mcpu=cortex-a15 --sysroot=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900' 'CFLAGS= -Os -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/build=/usr/src/python -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/python/2.7.11-r1.2/Python-2.7.11=/usr/src/python -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/i686-linux= -fdebug-prefix-map=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900= ' 'LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' 'CPPFLAGS=' 'CPP=arm-oe-linux-gnueabi-gcc -E --sysroot=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900  -march=armv7ve -mfpu=neon-vfpv4  -mfloat-abi=hard -mcpu=cortex-a15' 'PKG_CONFIG_PATH=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib/pkgconfig:/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/share/pkgconfig' 'PKG_CONFIG_LIBDIR=/home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib/pkgconfig'
    159165
    160166
     
    196202PYTHON=         python$(EXE)
    197203BUILDPYTHON=    python$(BUILDEXE)
    198 HOSTPYTHON=     ./$(BUILDPYTHON)
    199 
    200 PYTHON_FOR_BUILD=_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) python2.7
    201 _PYTHON_HOST_PLATFORM=linux2-sh4
    202 HOST_GNU_TYPE=  sh4-unknown-linux-gnu
     204
     205PYTHON_FOR_BUILD=_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) python2.7
     206_PYTHON_HOST_PLATFORM=linux2-arm
     207HOST_GNU_TYPE=  arm-oe-linux-gnueabi
    203208
    204209# Tcl and Tk config info from --with-tcltk-includes and -libs options
     
    207212
    208213# The task to run while instrument when building the profile-opt target
    209 PROFILE_TASK=   $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
    210 #PROFILE_TASK=  $(srcdir)/Lib/test/regrtest.py
     214PROFILE_TASK=-m test.regrtest --pgo
    211215
    212216# === Definitions added by makesetup ===
    213217
    214 LOCALMODLIBS=           
     218LOCALMODLIBS=            
    215219BASEMODLIBS=
    216220GLHACK=-Dclear=__GLclear
     
    220224TKPATH=:lib-tk
    221225EXTRAMACHDEPPATH=
    222 MACHDEPPATH=:plat-$(MACHDEP)
     226MACHDEPPATH=:$(PLATDIR)
    223227TESTPATH=
    224228SITEPATH=
     
    248252
    249253
    250 LIBFFI_INCLUDEDIR=     
     254LIBFFI_INCLUDEDIR=      /home/atemio/flashimg/BUILDGIT/checkout_mips360/builds/titannit/release/dm900/tmp/sysroots/dm900/usr/lib/libffi-3.2.1/include
    251255
    252256##########################################################################
     
    320324##########################################################################
    321325# Python
     326
     327OPCODETARGETS_H= \
     328                $(srcdir)/Python/opcode_targets.h
     329               
     330OPCODETARGETGEN= \
     331                $(srcdir)/Python/makeopcodetargets.py
     332
     333OPCODETARGETGEN_FILES= \
     334                $(OPCODETARGETGEN) $(srcdir)/Lib/opcode.py
     335
    322336PYTHON_OBJS=    \
    323337                Python/_warnings.o \
     
    430444build_all:      $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
    431445
    432 # Compile a binary with gcc profile guided optimization.
     446# Compile a binary with profile guided optimization.
    433447profile-opt:
     448        @if [ $(LLVM_PROF_ERR) == yes ]; then \
     449                echo "Error: Cannot perform PGO build because llvm-profdata was not found in PATH" ;\
     450                echo "Please add it to PATH and run ./configure again" ;\
     451                exit 1;\
     452        fi
    434453        @echo "Building with support for profile generation:"
    435454        $(MAKE) clean
     455        $(MAKE) profile-removal
    436456        $(MAKE) build_all_generate_profile
    437         @echo "Running benchmark to generate profile data:"
    438457        $(MAKE) profile-removal
     458        @echo "Running code to generate profile data (this can take a while):"
    439459        $(MAKE) run_profile_task
     460        $(MAKE) build_all_merge_profile
    440461        @echo "Rebuilding with profile guided optimizations:"
    441462        $(MAKE) clean
    442463        $(MAKE) build_all_use_profile
     464        $(MAKE) profile-removal
    443465
    444466build_all_generate_profile:
    445         $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
     467        $(MAKE) all CFLAGS="$(CFLAGS) $(PGO_PROF_GEN_FLAG)" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)"
    446468
    447469run_profile_task:
    448470        : # FIXME: can't run for a cross build
    449         ./$(BUILDPYTHON) $(PROFILE_TASK)
     471        $(LLVM_PROF_FILE) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
     472
     473build_all_merge_profile:
     474        $(LLVM_PROF_MERGER)
    450475
    451476build_all_use_profile:
    452         $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
     477        $(MAKE) all CFLAGS="$(CFLAGS) $(PGO_PROF_USE_FLAG)"
    453478
    454479coverage:
     
    494519        $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
    495520                _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
    496                 PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(PYTHON_FOR_BUILD) \
    497                 $(srcdir)/setup.py $$quiet build
     521                $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
    498522
    499523# Build static library
     
    618642                -DVERSION='"$(VERSION)"' \
    619643                -DVPATH='"$(VPATH)"' \
     644                -DLIB='"$(LIB)"' \
    620645                -o $@ $(srcdir)/Modules/getpath.c
    621646
     
    629654Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h
    630655
    631 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
     656$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN)
    632657                @$(MKDIR_P) Include
    633                 $(MAKE) $(PGEN)
    634658                $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
    635659$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
    636                 $(MAKE) $(GRAMMAR_H)
    637660                touch $(GRAMMAR_C)
    638661
     
    660683
    661684Python/getplatform.o: $(srcdir)/Python/getplatform.c
    662                 $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
     685                $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
    663686
    664687Python/importdl.o: $(srcdir)/Python/importdl.c
     
    691714Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
    692715                                $(STRINGLIB_HEADERS)
     716
     717$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
     718        $(OPCODETARGETGEN) $(OPCODETARGETS_H)
     719
     720Python/ceval.o: $(OPCODETARGETS_H)
    693721
    694722Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
     
    800828# sample data.
    801829
    802 TESTOPTS=       -l $(EXTRATESTOPTS)
     830TESTOPTS=       -l -v $(EXTRATESTOPTS)
    803831TESTPROG=       $(srcdir)/Lib/test/regrtest.py
    804 TESTPYTHON=     $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
    805 test:           all platform
    806                 -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
     832TESTPYTHON=     $(RUNSHARED) $(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
     833test:           build-test
     834                $(MAKE) runtest-TESTS
     835
     836runtest-TESTS:
     837                -find $(srcdir) -name '*.py[co]' -print | xargs rm -f
    807838                -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
    808839                $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
     840
     841build-test:     all platform
    809842
    810843testall:        all platform
     
    9671000
    9681001# Install the library
    969 PLATDIR=        plat-$(MACHDEP)
     1002PLATDIR=        plat-linux2
    9701003EXTRAPLATDIR=
    9711004EXTRAMACHDEPPATH=
     
    10631096                        $(DESTDIR)$(LIBDEST)/distutils/tests ; \
    10641097        fi
    1065         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
     1098        PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
    10661099                $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
    10671100                -d $(LIBDEST) -f \
    10681101                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
    10691102                $(DESTDIR)$(LIBDEST)
    1070         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
    1071                 $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
     1103        PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \
     1104                $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
    10721105                -d $(LIBDEST) -f \
    10731106                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
    10741107                $(DESTDIR)$(LIBDEST)
    1075         -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
    1076                 $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
     1108        -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
     1109                $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
    10771110                -d $(LIBDEST)/site-packages -f \
    10781111                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
    1079         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
    1080                 $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
     1112        -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
     1113                $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
    10811114                -d $(LIBDEST)/site-packages -f \
    10821115                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
    1083         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
     1116        -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
    10841117                $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
    1085         -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
     1118        -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
    10861119                $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
    10871120
     
    11341167
    11351168libainstall:    all python-config
    1136         @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
     1169        @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC) $(BINDIR); \
    11371170        do \
    11381171                if test ! -d $(DESTDIR)$$i; then \
     
    11961229# This goes into $(exec_prefix)
    11971230sharedinstall: sharedmods
    1198         CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
    11991231        $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
    1200                 --skip-build \
    12011232                --prefix=$(prefix) \
    12021233                --install-scripts=$(BINDIR) \
     
    13381369        find build -name 'fficonfig.py' -exec rm -f {} ';' || true
    13391370        -rm -f Lib/lib2to3/*Grammar*.pickle
     1371        -rm -rf build
    13401372
    13411373profile-removal:
    13421374        find . -name '*.gc??' -exec rm -f {} ';'
     1375        find . -name '*.profclang?' -exec rm -f {} ';'
    13431376
    13441377clobber: clean profile-removal
     
    14431476Modules/symtablemodule.o: $(srcdir)/Modules/symtablemodule.c; $(CC) $(PY_CFLAGS)  -c $(srcdir)/Modules/symtablemodule.c -o Modules/symtablemodule.o
    14441477Modules/_symtablemodule$(SO):  Modules/symtablemodule.o; $(BLDSHARED)  Modules/symtablemodule.o   -o Modules/_symtablemodule$(SO)
     1478Modules/md5module.o: $(srcdir)/Modules/md5module.c; $(CC) $(PY_CFLAGS)  -c $(srcdir)/Modules/md5module.c -o Modules/md5module.o
     1479Modules/md5.o: $(srcdir)/Modules/md5.c; $(CC) $(PY_CFLAGS)  -c $(srcdir)/Modules/md5.c -o Modules/md5.o
     1480Modules/_md5module$(SO):  Modules/md5module.o Modules/md5.o; $(BLDSHARED)  Modules/md5module.o Modules/md5.o   -o Modules/_md5module$(SO)
    14451481Modules/xxsubtype.o: $(srcdir)/Modules/xxsubtype.c; $(CC) $(PY_CFLAGS)  -c $(srcdir)/Modules/xxsubtype.c -o Modules/xxsubtype.o
    14461482Modules/xxsubtype$(SO):  Modules/xxsubtype.o; $(BLDSHARED)  Modules/xxsubtype.o   -o Modules/xxsubtype$(SO)
  • titan/plugins/tithek/tithek_global.h

    r40088 r40094  
    1212        string_tolower(tmplink);
    1313
     14
    1415        char* cmd = NULL;
    15         cmd = ostrcat("/tmp/localhoster/hoster.sh get \"", url, 0, 0);
     16        cmd = ostrcat("/tmp/localhoster/hoster.sh youtube_dl \"", url, 0, 0);
    1617        cmd = ostrcat(cmd, "\"", 1, 0);
    1718        streamurl = command(cmd);
    1819        streamurl = string_newline(streamurl);
    1920        free(cmd), cmd = NULL;
    20                
     21
     22        if(streamurl == NULL)
     23        {
     24                cmd = ostrcat("/tmp/localhoster/hoster.sh get \"", url, 0, 0);
     25                cmd = ostrcat(cmd, "\"", 1, 0);
     26                streamurl = command(cmd);
     27                streamurl = string_newline(streamurl);
     28                free(cmd), cmd = NULL;
     29        }
     30
    2131        if(streamurl == NULL)
    2232        {
     
    97107                else
    98108                {
    99                         cmd = ostrcat("/tmp/localhoster/hoster.sh get ", url, 0, 0);
     109                        cmd = ostrcat("/tmp/localhoster/hoster.sh youtube_dl ", url, 0, 0);
    100110                        cmd = ostrcat(cmd, "\"", 1, 0);
    101111                        streamurl = command(cmd);
Note: See TracChangeset for help on using the changeset viewer.