Skip to content

Commit

Permalink
Bump version to 0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ray2501 committed Jun 7, 2018
1 parent a1d6dc1 commit a9546ca
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 31 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
2018-06-07 Danilo Chang

* Bump version to 0.4
* Update source code, use LIBVLC_VERSION_INT to check VLC version

2017-01-09 Danilo Chang
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ PKG_HEADERS =
# configuration options) composed of the named objects.
#========================================================================

PKG_LIB_FILE = libtkvlc0.3.so
PKG_STUB_LIB_FILE = libtkvlcstub0.3.a
PKG_LIB_FILE = libtkvlc0.4.so
PKG_STUB_LIB_FILE = libtkvlcstub0.4.a

lib_BINARIES = $(PKG_LIB_FILE)
BINARIES = $(lib_BINARIES)
Expand Down Expand Up @@ -94,7 +94,7 @@ INSTALL_SCRIPT = ${INSTALL}
INSTALL_LIBRARY = ${INSTALL_DATA}

PACKAGE_NAME = tkvlc
PACKAGE_VERSION = 0.3
PACKAGE_VERSION = 0.4
CC = gcc
CFLAGS_DEFAULT = -O2 -fomit-frame-pointer -DNDEBUG
CFLAGS_WARNING = -Wall
Expand All @@ -113,7 +113,7 @@ SHLIB_LD_LIBS = ${LIBS} -L/usr/lib64 -ltclstub8.6
STLIB_LD = ${AR} cr
#TCL_DEFS = -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tcl\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DHAVE_ZLIB=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -DTCL_SHLIB_EXT=\".so\" -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_MKSTEMP=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETNAMEINFO=1 -DHAVE_GETADDRINFO=1 -DHAVE_FREEADDRINFO=1 -DHAVE_GAI_STRERROR=1 -DHAVE_STRUCT_ADDRINFO=1 -DHAVE_STRUCT_IN6_ADDR=1 -DHAVE_STRUCT_SOCKADDR_IN6=1 -DHAVE_STRUCT_SOCKADDR_STORAGE=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_GETHOSTBYNAME_R_6=1 -DHAVE_GETHOSTBYNAME_R=1 -DHAVE_GETHOSTBYADDR_R_8=1 -DHAVE_GETHOSTBYADDR_R=1 -DHAVE_TERMIOS_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLOCKS=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_BLKCNT_T=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DNO_UNION_WAIT=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_MKSTEMPS=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DTCL_UNLOAD_DLLS=1 -DHAVE_CPUID=1
TCL_BIN_DIR = /usr/lib64
TCL_SRC_DIR = /home/abuild/rpmbuild/BUILD/tcl8.6.6
TCL_SRC_DIR = /home/abuild/rpmbuild/BUILD/tcl8.6.8
#TK_BIN_DIR = @TK_BIN_DIR@
#TK_SRC_DIR = @TK_SRC_DIR@

Expand Down Expand Up @@ -154,8 +154,8 @@ PKG_CFLAGS =
# that your library may use. TCL_DEFS can actually be a problem if
# you do not compile with a similar machine setup as the Tcl core was
# compiled with.
#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"tkvlc\" -DPACKAGE_TARNAME=\"tkvlc\" -DPACKAGE_VERSION=\"0.3\" -DPACKAGE_STRING=\"tkvlc\ 0.3\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tkvlc=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS)
DEFS = -DPACKAGE_NAME=\"tkvlc\" -DPACKAGE_TARNAME=\"tkvlc\" -DPACKAGE_VERSION=\"0.3\" -DPACKAGE_STRING=\"tkvlc\ 0.3\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tkvlc=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS)
#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"tkvlc\" -DPACKAGE_TARNAME=\"tkvlc\" -DPACKAGE_VERSION=\"0.4\" -DPACKAGE_STRING=\"tkvlc\ 0.4\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tkvlc=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS)
DEFS = -DPACKAGE_NAME=\"tkvlc\" -DPACKAGE_TARNAME=\"tkvlc\" -DPACKAGE_VERSION=\"0.4\" -DPACKAGE_STRING=\"tkvlc\ 0.4\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tkvlc=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS)

# Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It involves making a frame widget in Tcl, and then passing its Windows
HWND or X Window ID to C (use `winfo id window`) to initialize the
libVLC media player.

User also can use this extension in console program, just not pass HWAD
User also can use this extension in console program, just not pass HWND
when using `tkvlc::init` to initialize (after version 0.4).


Expand Down
22 changes: 11 additions & 11 deletions config.status
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by tkvlc $as_me 0.3, which was
This file was extended by tkvlc $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -419,7 +419,7 @@ Report bugs to the package provider."

ac_cs_config=""
ac_cs_version="\
tkvlc config.status 0.3
tkvlc config.status 0.4
configured by ./configure, generated by GNU Autoconf 2.69,
with options \"$ac_cs_config\"
Expand Down Expand Up @@ -629,8 +629,8 @@ S["INSTALL"]="$(SHELL) $(srcdir)/tclconfig/install-sh -c"
S["CPP"]="gcc -E"
S["TCL_SHLIB_LD_LIBS"]="${LIBS}"
S["TCL_LD_FLAGS"]=" -Wl,--export-dynamic "
S["TCL_EXTRA_CFLAGS"]="-fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -g -pip"\
"e "
S["TCL_EXTRA_CFLAGS"]="-fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack"\
"-clash-protection -g -pipe "
S["TCL_DEFS"]="-DPACKAGE_NAME=\\\"tcl\\\" -DPACKAGE_TARNAME=\\\"tcl\\\" -DPACKAGE_VERSION=\\\"8.6\\\" -DPACKAGE_STRING=\\\"tcl\\ 8.6\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\""\
" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_"\
"H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1"\
Expand All @@ -657,9 +657,9 @@ S["TCL_STUB_LIB_FILE"]="libtclstub8.6.a"
S["TCL_LIB_SPEC"]="-L/usr/lib64 -ltcl8.6"
S["TCL_LIB_FLAG"]="-ltcl8.6"
S["TCL_LIB_FILE"]="libtcl8.6.so"
S["TCL_SRC_DIR"]="/home/abuild/rpmbuild/BUILD/tcl8.6.6"
S["TCL_SRC_DIR"]="/home/abuild/rpmbuild/BUILD/tcl8.6.8"
S["TCL_BIN_DIR"]="/usr/lib64"
S["TCL_PATCH_LEVEL"]=".6"
S["TCL_PATCH_LEVEL"]=".8"
S["TCL_VERSION"]="8.6"
S["PKG_CFLAGS"]=" "
S["PKG_LIBS"]=" -lvlc"
Expand All @@ -668,8 +668,8 @@ S["PKG_HEADERS"]=""
S["PKG_TCL_SOURCES"]=""
S["PKG_STUB_OBJECTS"]=""
S["PKG_STUB_SOURCES"]=""
S["PKG_STUB_LIB_FILE"]="libtkvlcstub0.3.a"
S["PKG_LIB_FILE"]="libtkvlc0.3.so"
S["PKG_STUB_LIB_FILE"]="libtkvlcstub0.4.a"
S["PKG_LIB_FILE"]="libtkvlc0.4.so"
S["EXEEXT"]=""
S["CYGPATH"]="echo"
S["target_alias"]=""
Expand All @@ -679,7 +679,7 @@ S["LIBS"]=""
S["ECHO_T"]=""
S["ECHO_N"]="-n"
S["ECHO_C"]=""
S["DEFS"]="-DPACKAGE_NAME=\\\"tkvlc\\\" -DPACKAGE_TARNAME=\\\"tkvlc\\\" -DPACKAGE_VERSION=\\\"0.3\\\" -DPACKAGE_STRING=\\\"tkvlc\\ 0.3\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_UR"\
S["DEFS"]="-DPACKAGE_NAME=\\\"tkvlc\\\" -DPACKAGE_TARNAME=\\\"tkvlc\\\" -DPACKAGE_VERSION=\\\"0.4\\\" -DPACKAGE_STRING=\\\"tkvlc\\ 0.4\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_UR"\
"L=\\\"\\\" -DBUILD_tkvlc=/\\*\\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_S"\
"TRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THR"\
"EAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\\ __attribute__\\(\\(__visibility__\\(\\\"hidden\\\"\\)\\)\\) -DHAVE_HID"\
Expand Down Expand Up @@ -708,8 +708,8 @@ S["prefix"]="/usr"
S["exec_prefix"]="/usr"
S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]=""
S["PACKAGE_STRING"]="tkvlc 0.3"
S["PACKAGE_VERSION"]="0.3"
S["PACKAGE_STRING"]="tkvlc 0.4"
S["PACKAGE_VERSION"]="0.4"
S["PACKAGE_TARNAME"]="tkvlc"
S["PACKAGE_NAME"]="tkvlc"
S["PATH_SEPARATOR"]=":"
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tkvlc 0.3.
# Generated by GNU Autoconf 2.69 for tkvlc 0.4.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tkvlc'
PACKAGE_TARNAME='tkvlc'
PACKAGE_VERSION='0.3'
PACKAGE_STRING='tkvlc 0.3'
PACKAGE_VERSION='0.4'
PACKAGE_STRING='tkvlc 0.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1299,7 +1299,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures tkvlc 0.3 to adapt to many kinds of systems.
\`configure' configures tkvlc 0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1360,7 +1360,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of tkvlc 0.3:";;
short | recursive ) echo "Configuration of tkvlc 0.4:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1463,7 +1463,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tkvlc configure 0.3
tkvlc configure 0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1828,7 +1828,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tkvlc $as_me 0.3, which was
It was created by tkvlc $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -9384,7 +9384,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by tkvlc $as_me 0.3, which was
This file was extended by tkvlc $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -9437,7 +9437,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
tkvlc config.status 0.3
tkvlc config.status 0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dnl to configure the system for the local environment.
# so that we create the export library with the dll.
#-----------------------------------------------------------------------

AC_INIT([tkvlc], [0.3])
AC_INIT([tkvlc], [0.4])

#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
Expand Down
4 changes: 2 additions & 2 deletions pkgIndex.tcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Tcl package index file
#
package ifneeded tkvlc 0.3 \
[list load [file join $dir libtkvlc0.3.so] tkvlc]
package ifneeded tkvlc 0.4 \
[list load [file join $dir libtkvlc0.4.so] tkvlc]
5 changes: 4 additions & 1 deletion tkvlc_SUSE.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Name: tkvlc
Summary: A demo to embed libVLC to Tk toolkit widget
Version: 0.3
Version: 0.4
Release: 0
License: MIT
Group: Development/Libraries/Tcl
Expand All @@ -20,6 +20,9 @@ BuildRoot: %{buildroot}
%description
A demo to embed libVLC to Tk toolkit widget.

User also can use this extension in console program, just not
pass HWND when using tkvlc::init to initialize.

%prep
%setup -q -n %{name}-%{version}

Expand Down

0 comments on commit a9546ca

Please sign in to comment.