VideoLAN Wiki - User contributions [en]

Git

2008-05-31T20:32:59Z

Trax: /* Fetching a remote branch */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, it is the following Windows Security Update (April 3, 2007) which is actually the cause of the Cygwin issue: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''It is possible to get 'git clone' working again on the affected systems by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

If warnings appear that files still need updating:
$ include/libvlc_internal.h: needs update
include/mediacontrol_internal.h: needs update
include/vlc/libvlc.h: needs update
include/vlc_update.h: needs update
modules/access/mms/mms.c: needs update
...

Then do a checkout -f to revert non committed local changes
$ git checkout -f

To stay up-to-date another
$ git pull --rebase
Should give no more warnings.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Win32CompileCygwinNew

2008-05-25T11:24:16Z

Trax: /* Git */

This is a new version of the Win32CompileCygwin written by [[User:J-b|Jean-Baptiste Kempf]]
'''This version ONLY works for 0.9.x.'''

=Introduction=

This is a guide for Windows users with a step-by-step instruction to download, install, configure and build your VLC.

This guide uses [http://www.cygwin.com '''Cygwin'''] a Linux-like environment for Windows used for compilation of the VLC source code.

Start off by creating a VLC and a download folder on your hard drive where you can put all the installation files:

C:\VLC\
C:\VLC\Downloads

For further reference, the assumption is made that the local user will be 'Administrator'.

=Cygwin=

Download the latest [http://www.cygwin.com/cygwin/setup.exe Cygwin setup] and save it in your download location:

C:\VLC\Downloads\

More info about Cygwin can be found at http://www.cygwin.com or http://sourceware.org/cygwin

==Selecting Cygwin packages to install==

Run the setup program with the following options:

Installation type : Install from Internet (default)

Root directory : C:\cygwin (default)

Local Package directory : C:\VLC\Downloads\cygwin (your download location)

Internet Connection : Direct Connection (preferred, if it fails try another)

Download Site : Choose a download site closest to you (FTP preferred)

At the "Select Packages" section of the installation process you can select packages by clicking the button with the rotating 2 arrows. (This is under the "New" section). It shows "Skip" next to the button if the package isn't selected yet.

Clicking the button a few times will rotate through the possible package versions including "Skip" (meaning do not install or remove if installed) and "Keep" (meaning keep using the current installed version). If a package was already installed it will also show the "Current" version just to the left of it.

Select the following packages (some others will automatically be selected as well):

Archive
unzip
zip

Devel
autoconf
automake
binutils
cvs
expat
gcc
gcc-core
gcc-g++
gcc-mingw
gcc-mingw-core
gcc-mingw-g++
gdb
gettext
gettext-devel
git
libtool
make
mingw-runtime
nasm
patchutils
pkg-config
subversion

Editor
vim

Libs
libgcrypt

Web
curl (optional: for building extras/contrib)
wget (optional: for building extras/contrib)

==Cygwin environment==

Start Cygwin from the icon on your desktop (With Windows Vista run it with admin rights, so right click and select "Run as administrator"). If it runs for the first time it will automatically create a home\"username" folder in the Cygwin environment; user being the currently logged on Windows user. Assuming this is the 'Administrator' user it will create the following folder:

C:\cygwin\home\Administrator (example)

NOTE: On your desktop, you can rightclick the Cygwin icon and (in the Options field of the Cygwin Properties) set the Command history Buffer size to as large as possible: 999. This setting will make it possible to scroll back further in the Cygwin environment.

=VLC source code=

== Git ==
The very latest VLC source code can be obtained through a tool called Git. The Cygwin package we're about to install comes with an internal git component.

cd /cygdrive/c/VLC/

git clone git://git.videolan.org/vlc.git

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, it is the following Windows Security Update (April 3, 2007) which is actually the cause of the Cygwin issue: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''It is possible to get 'git clone' working again on the affected systems by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

25 may 2008 error is now

fatal: pack has bad object at offset 83704978: inflate returned -3
fatal: index-pack failed
fetch-pack from 'git://git.videolan.org/vlc.git' failed.

== Snapshots ==

You can do the same by using the snapshots in the nightly builds site.

=Bootstrap=

Open the configure.ac file, and modify the requirement for gettext 0.17 to 0.15 (so replace line '''AM_GNU_GETTEXT_VERSION(0.17)''' with line '''AM_GNU_GETTEXT_VERSION(0.15)'''), and then run bootstrap.

cd vlc
./bootstrap

= External libraries to the source code=

VLC depends on other libraries (code) to provide some features like AC3 audio or MPEG-4 video encoding/decoding etc.

Depending on your needs you will have to install and compile some or all of these external libraries.

== Get the Win32 "contrib" package ==

A package with most of these libraries already compiled so it's actually really easy to compile a full-featured version of vlc can be found here:

http://download.videolan.org/pub/testing/win32/

Download the latest version of a "contrib" package for win32:

contrib-20060730-win32-bin-gcc-3.4.5-only.tar.bz2 (example)

Those days, you should use
http://people.videolan.org/~jb/Contribs/contrib-20080215-win32-bin-gcc-4.2.1-sjlj-runtime-3.13-only.tar.bz2

It's a good idea to check the INSTALL.Win32 file in the VLC source directory for the appropriate contrib download file.

Save it into your download location:

C:\VLC\Downloads\

==Installing the Win32 "contrib" package in Cygwin==

Start Cygwin and enter the following command in your shell:

cd /cygdrive/c/VLC/Downloads
tar xf contrib-20080215-win32-bin-gcc-4.2.1-sjlj-runtime-3.13-only.tar.bz2 -C /

Replace with your version of the "contrib" file and DON'T FORGET THE / (slash)
at the end.

This will extract the contents of the file into usr/win32 folder within your Cygwin environment.

NOTE: Make sure to DELETE your old version instead of extracting a new version on top of it.

==Keeping the Win32 "contrib" package up-to-date==

For maintenance purposes periodically check:

http://download.videolan.org/pub/testing/win32/

=Configure=

In order to make our lives just a bit easier the following section describes what commandline options should be used for compiling and those commands will then be put into a "script" that can be executed (rather than having to copy and paste all the time).

==Configure script for compiling VLC==

Create a new text document with the following lines:

PATH=/usr/win32/bin:$PATH \
PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig \
CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
LDFLAGS=-L/usr/win32/lib \
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
./configure \
--host=i686-pc-mingw32 \
--disable-gtk \
--enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
--enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
--with-ffmpeg-zlib --enable-faad --enable-flac --enable-theora \
--with-wx-config-path=/usr/win32/bin \
--with-freetype-config-path=/usr/win32/bin \
--with-fribidi-config-path=/usr/win32/bin \
--enable-live555 --with-live555-tree=/usr/win32/live.com \
--enable-caca --with-caca-config-path=/usr/win32/bin \
--with-xml2-config-path=/usr/win32/bin \
--with-dvdnav-config-path=/usr/win32/bin \
--disable-cddax --disable-vcdx --enable-goom \
--enable-twolame --enable-dvdread \
--enable-debug --enable-dca \
--disable-mkv --disable-taglib

NOTE: The following options are added for debug purposes and makes the final package a bit larger but the advantage is it's easier to debug in case of crash reports:

--disable-optimizations
--enable-debug

If you want to report a crash bug to the VLC team, it is necessary that you provide a stack backtrace. Unfortunately, Windows automatic crash reporter cannot generate such a backtrace as debug symbols used by GCC compiler aren't understood by Windows, therefore we suggest that you install Dr. MinGW (http://jrfonseca.dyndns.org/projects/gnu-win32/software/drmingw/) which will extend Windows Just-In-Time Debugger and provide the necessary debug information.

NOTE: The following options is needed for Qt4 support:

--enable-qt4

As of version 0.9.0 VLC will include the Qt interface. More information can be found about QT here: http://www.trolltech.com

The "Win32 contrib package" at present includes the linux and Windows equivalents of uic, moc and roc executables which are required for building this interface.

The linuxs executables have to be '''deleted''' from the contrib folder:

C:\cygwin\usr\win32\bin\moc (example)
C:\cygwin\usr\win32\bin\rcc (example)
C:\cygwin\usr\win32\bin\uic (example)

Save as filename in your "scripts" folder at your download/install location:

configure-vlc.sh

NOTE: Save using "All files" and not "Text files" otherwise Windows might append the extension .txt

Copy the file into your home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix configure-vlc.sh

After your configure-vlc.sh is completed, copy it to your vlc directory and run it:

./configure-vlc.sh

If it complains about permissions, use chmod and try again:

chmod 777 configure-vlc.sh

NOTE. (If you plan to use JVLC) To make vlc-control.dll accessible by Java on ''Windows'' cofigure-vlc.sh should be modified to include "-Wl,--add-stdcal-alias". Example:

...
CC="gcc -mno-cygwin -Wl,--add-stdcall-alias" CXX="g++ -mno-cygwin -Wl,--add-stdcall-alias" \
./configure \
...

===POSIX emulation layer===

VLC can be built with or without the so called POSIX emulation layer. Without is the default and is usually better (and with hasn't been tested for quite some time). If you do want to use the emulation layer, then just leave out the line with the following options:

CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"

=Compiling source code=

It's time to start Cygwin again...

==Compiling VLC==

Enter the following commands in your Cygwin shell:

cd vlc

Build it! (remember to run configure-vlc.sh before first build)

make

Cross your fingers and wait... because it might take few hours before compilation is done

==Creating self contained packages==

Once the compilation is done, you can either run VLC directly from the source tree or you can build self-contained VLC packages with the following "make" commands:

make package-win32-base

(This will create a subdirectory named vlc-x.x.x with all the binaries "stripped" without any debugging symbols).

make package-win32-zip

(Same as above but will package the directory in a zip file).

make package-win32

(Same as above but will also create an auto-installer package. You will need to have NSIS installed in its default location for this to work).

=Advanced usage=

==Updating Cygwin package versions==

If you need to update or install additional packages you can just run the Cygwin setup.exe from your download location:

C:\Downloads\cygwin\setup.exe (example)

==GDB (Gnu Debugger)==

This section requires that you installed the gdb (Gnu Debugger) in Cygwin.

This is a typical example of creating a crashlog:

cd vlc-trunk

gdb --args vlc.exe --fast-mutex --reset-config --reset-plugins-cache

NOTE: vlc-0.9.0 uses libtool for building sources, if you want to debug from the source tree, you should type the following command instead:

libtool --mode=execute gdb --args vlc --reset-config --reset-plugins-cache

In the debugger mode run the program and make sure you reset the preferences!

(gdb) run

NOTE: the (gdb) is just a prompt which means you are in the debugger mode, please note that ''--fast-mutex'' option is no longer supported in vlc-0.9.0

It will now take a lot longer than usual for VLC to start :)

Now operate VLC as you would normally do. As soon as a crash issue occurs
you'll notice a line like this:

Program received signal SIGSEGV, Segmentation fault.
0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
---Type <return> to continue, or q <return> to quit---
459 i = i_bottom + ( i_top - i_bottom ) / 2;

Now you can do a "backtrace" by using the bt command:

(gdb) bt

And output similar to this will be created:

#0 0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
#1 0x0b26bbf7 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29fef8}) at playlist.cpp:695
#2 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29e8b0}) at playlist.cpp:689
#3 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29a818}) at playlist.cpp:689
#4 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x299718}) at playlist.cpp:689
#5 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0xffff0000}) at playlist.cpp:689
#6 0x0b26bf49 in wxvlc::Playlist::AppendItem (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:564
#7 0x0b2757fc in wxvlc::Playlist::OnPlaylistEvent (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:1438
#8 0x0b3771b8 in wxEvtHandler::ProcessEventIfMatches ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#9 0x0b376a1c in wxEventHashTable::HandleEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#10 0x0b37730d in wxEvtHandler::ProcessEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#11 0x0b37711b in wxEvtHandler::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
---Type <return> to continue, or q <return> to quit---
#12 0x0b376017 in wxAppConsole::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#13 0x0b3ec75a in wxIdleWakeUpModule::MsgHookProc ()
at /usr/win32/include/wx-2.6/wx/bmpbuttn.h:81
#14 0x773aca2d in USER32!GetScrollRange ()
from /cygdrive/c/WINDOWS/system32/user32.dll
#15 0x00000000 in ?? () from
(gdb)

To backtrace all the running threads use:

(gdb) thread apply all bt

These are the log outputs that are more usefull to developers than just mentioning "it crashes"!

NOTE: In GDB mode there are sometimes situations where GDB initially "crashes" on certain network activity (opening network shares, network traffic) which in normal operation does not occur. Just select c for continue until "normal" operation continues.

== Common errors ==
===vlc.exe: Permission denied===

A make finished successfully and produced vlc.exe, but running the executable returns the following:

bash: ./vlc.exe: Permission denied

The permissions on both vlc.exe & vlc.exe.manifest must be set to executable.

FIX: Type the following:

chmod 755 vlc.exe vlc.exe.manifest

===error: parse error before '(' token===

A make (compile) of FFmpeg results in the following error:

/usr/include/sys/unistd.h:203: error: parse error before '(' token
make[1]: *** [ffm.o] Error 1

It's very likely you are usix the POSIX emulater which you shouldn't...

FIX: compile with the option

-mno-cygwin

==error: expected primary-expression before '<<' token==

In file included from /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32
api/windows.h:52,
from ../../../include/vlc_common.h:459,
from ../../../include/vlc/vlc.h:153,
from dshow.cpp:31:
/usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32api/wingdi.h:3:1: warn
ing: this is the location of the previous definition
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:14: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:5552: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:45,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/strmif.h:2: warning: ignoring #pragma warning
In file included from /usr/win32/include/dsound.h:13,
from /usr/win32/include/amaudio.h:18,
from /usr/win32/include/dshow.h:47,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/d3dtypes.h:22: warning: ignoring #pragma warning
/usr/win32/include/d3dtypes.h:1813: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:48,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/control.h:2: warning: ignoring #pragma warning
dshow.cpp: In function `int CommonOpen(vlc_object_t*, access_sys_t*, vlc_bool_t)
':
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<' token
dshow.cpp:456: error: expected primary-expression before '.' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '=' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>' token
dshow.cpp:484: error: expected primary-expression before '.' token
dshow.cpp:485: error: expected `;' before "IAMCrossbar"
dshow.cpp:491: error: `pXbar' undeclared (first use this function)
dshow.cpp:491: error: (Each undeclared identifier is reported only once for each
function it appears in.)
make[6]: *** [libdshow_plugin_a-dshow.o] Error 1
make[6]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[5]: *** [all-modules] Error 1
make[5]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/Administrator/vlc-trunk/modules/access'
make[3]: *** [all] Error 2

Basically in case of conflict svn adds "<<< mine" and "=======" and ">>>> r1242" which makes gcc complain.

FIX: revert the offending file

==Objective C source seen but `OBJC' is undefined==

The configure process stops halfway.

+ aclocal-1.9 -I m4
+ autoconf
+ autoheader
+ automake-1.9 --add-missing --copy -Wall
configure.ac: installing `autotools/install-sh'
configure.ac: installing `autotools/missing'
activex/Makefile.am:143: shell $(VLC_CONFIG: non-POSIX variable name
activex/Makefile.am:143: (probably a GNU make extension)
activex/Makefile.am: installing `autotools/compile'
activex/Makefile.am: installing `autotools/depcomp'
modules/gui/macosx/Makefile.am: Objective C source seen but `OBJC' is undefined
modules/misc/testsuite/Makefile.am: Objective C source seen but `OBJC' is undefi
ned
src/Makefile.am: Objective C source seen but `OBJC' is undefined
Makefile.am:282: user target `vlc$(EXEEXT)' defined here...
/usr/share/automake-1.9/am/program.am: ... overrides Automake target `vlc$(EXEEX
T)' defined here
Makefile.am:230: while processing program `vlc'
make: *** No targets specified and no makefile found. Stop.

This problem is related to a warning earlier on and only occured in a few revisions where a built-in workaround wasn't working properly:

+ echo 'Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.'
Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.

FIX: update autoconf to 2.60 or newer. If Cygwin doesn't provide this version yet then build it yourself from extras/contrib.

Enter the following commands in your Cygwin shell:

cd vlc-trunk/extras/contrib

./bootstrap

cd src

make .autoconf

There should now be compiled autoconf version (probably 2.60 or newer) in extras/contrib that the bootstrap process will use.

Now start the whole "Compile VLC" process from the start again.

==Error: cannot create temporary file for diversion: Permission denied==

If the above error appears, it might mean you don't have the TMPDIR defined in cygwin. You will need to define it and have its value point to your temporary directory. You can use '''export TMPDIR="/cygdrive/c/temp"''' or any directory for it (/cygdrive/c/temp is same as C:\temp). If this doesn't help, make sure you run cygwin with admin rights (With Windows Vista, right click cygwin shortcut and select "Run as administrator"). Avira AntiVir might also cause issues to m4, so disabling it while ./bootstrap might help.

=Version=

20050627 Initial version

20050628 Updated some more exceptions

20050628 Some info added about FFmpeg compiling with AMR

20050629 Finalized FFmpeg compiling

20050630 Cross-compiling

20050724 Some extra compile explanations

20050726 Removed cross-compiling (was for linux -> win32) Patching source code with .diff files

20050823 Added zlib error

20050923 --enable-sdl --with-sdl-config-path=/usr/win32/bin added to configure. Added debug section

20051102 Changed FFmpeg lib names

20051128 Detailed Cygwin upgrade/downgrade for gcc 3.3. Renamed some update scripts. Added FFmpeg CVS update. --disable-gnomevfs added to configure (only used on linux)

20060121 PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig added to configure

20060128 Added curl and libtool to Cygwin for those that want to be able to build extras/contrib themselves

20060217 Added make install-libs install-headers to FFmpeg compile

20060222 Remark about missing "gettext" libs for Cygwin during install

20060225 ./bootstrap: you need libtool

20060618 Updated GCC to 3.4 version and added FFmpeg SVN and DTS support

20060805 Added note about using older binutils and gdb for Cygwin!

20060915 Added note about updating autoconf from extras/contrib for an OBJC problem during configure

20061108 Added note this document is no longer usable since Cygwin has been unusable probably related to some bash/dos2unix change

20070612 Added note about --enable-dca

20080228 New version by [[User:J-b|jb]]

20080307 Added --host=i686-pc-mingw32 option to the configure script

20080311 Simplification

20080323 Added some tips for Vista

[[Category:Building]]
[[Category:Coding]]

Git

2008-05-24T12:52:48Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, it is the following Windows Security Update (April 3, 2007) which is actually the cause of the Cygwin issue: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''It is possible to get 'git clone' working again on the affected systems by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-23T12:39:02Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, it is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''It is possible to get 'git clone' working again on the affected systems by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:32:36Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''It is possible to get 'git clone' working again on the affected systems by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:30:26Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''By removing the Security Update (KB925902) on the affected systems, it is possible to get 'git clone' working again but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:24:19Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the currently available Cygwin 1.5.25-12 with git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''To get 'git clone' working properly on the affected systems is by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:21:53Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the available Cygwin git package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''To get 'git clone' working properly on the affected systems is by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:16:16Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in the mail archives of the Cygwin project mailing list here
[http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''To get 'git clone' working properly on the affected systems is by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:13:29Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in several Cygwin mail archives such as [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is actually to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''To get 'git clone' working properly on the affected systems is by removing the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T17:11:38Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is referred to in several Cygwin mail archives such as [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Git error on Cygwin].

By eliminating the impossible, whatever remained, however improbable, is the following Windows Security Update (April 3, 2007) which is to blame: [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported not to be affected:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''To get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T16:52:28Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' (reproducable every time and at the same percentage) at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified (May 22, 2008) against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T16:50:36Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly (reproducable every time and at the same percentage) with a Cygwin error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

This has been verified May 22, 2008 against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1 and is a generic problem which also affects cloning from other git repositories (although x264.git seems unaffected).

The issue is reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)]

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:44:44Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

Verified May 22, 2008 against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1.

This is a generic problem which also affects cloning from other git repositories (although x264.git is unaffected). The issue is reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:39:11Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

Verified May 22, 2008 against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1.

This is a generic problem which also affects cloning from other git repositories (although x264.git is unaffected). The issue is reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:30:25Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using [http://www.cygwin.com Cygwin] (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

There is a problem on Windows XP (and possibly on other Microsoft Operating Systems) with 'git clone' which aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

Verified May 22, 2008 against the available Cygwin package versions 1.5.5.1-1 and 1.5.4-1.

The problem does not only affect VLC but also other git repositories (although x264.git is unaffected). This issue is reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:21:32Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with Security Update '''KB925902''' installed
Windows XP Service Pack 3

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (tested with available package versions 1.5.5.1-1 and 1.5.4-1, last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other git repositories. This is also reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems, these are reported to work OK:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:20:28Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with KB925902 installed
Windows XP Service Pack 3

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (tested with available package versions 1.5.5.1-1 and 1.5.4-1, last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other git repositories. This is also reported in the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is caused by the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems (last checked on May 22, 2008), these are reported to work fine:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T12:12:32Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin (linux-like build environment):'''

Applies to:

Windows XP Service Pack 2 with KB925902 installed
Windows XP Service Pack 3

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems (last checked on May 22, 2008), these are reported to work fine:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T11:41:59Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

Applies to:

Windows XP Service Pack 2 with KB925902 installed
Windows XP Service Pack 3

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following systems (last checked on May 22, 2008), these are reported to work fine:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T11:20:20Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

Applies to:

Windows XP Service Pack 2 with KB925902 installed
Windows XP Service Pack 3

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007): [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

Even though the same Security Update applies to the following Systems (last checked on May 22, 2008), these are reported to work fine:

Windows Vista Service Pack 1
Windows 2003 Server Standard Service Pack 2

''A workaround to get 'git clone' working properly on the affected systems is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.''

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:54:40Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and aborts unexpectedly with a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007):

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get 'git clone' working properly again is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:53:26Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly on other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and will result in a Cygwin error during the 'checking out files' at the end of the procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not only affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007):

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get 'git clone' working properly again is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:43:25Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly other Microsoft Operating Systems) has a problem with 'git clone' (last checked on May 22, 2008) and will throw an error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not just affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update (April 3, 2007):

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get 'git clone' working properly again is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:42:04Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly other Microsoft Operating Systems) has a problem with 'git clone' (last checked on 22 may 2008) and will throw an error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem does not just affect VLC but also other .git sources. It is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update:

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get 'git clone' working properly again is to remove the Security Update (KB925902) but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:33:24Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008) and will throw an error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update:

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:29:31Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008) and will throw an error during the 'checking out files' at the end of the clone procedure:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update:

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons, but then again when security is concerned

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T04:12:03Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

[http://www.cygwin.com Cygwin] on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008) and will throw an error during the 'checking out files' at the end of the proces:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - '''could not load shell32, Win32 error 487'''

The problem is reported on the [http://sourceware.org/ml/cygwin/2007-07/msg00858.html Cygwin mail archive: Git error on Cygwin] and is related to the following Windows Security Update:

[http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx Microsoft Security Bulletin MS07-017 - Vulnerabilities in GDI Could Allow Remote Code Execution (925902)].

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:42:12Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

Cygwin [http://www.cygwin.com] on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008). An error occurs at the end of the git clone procedure during the 'checking out files':

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The 'shell32, Win32 error 487' problem using git is reported on the Cygwin mailing here [http://sourceware.org/ml/cygwin/2007-07/msg00858.html].

The problem is actually caused by the following Security Update on Windows XP:

Microsoft Security Bulletin MS07-017 [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx] - Vulnerabilities in GDI Could Allow Remote Code Execution (925902).

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:40:44Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

'''Note for Windows users using Cygwin as a linux-like build environment:'''

Cygwin [http://www.cygwin.com] on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008). An error occurs at the end of the git clone procedure during the 'checking out files':

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The shell32, Win32 error 487 problem with git is reported on the Cygwin mailing here [http://sourceware.org/ml/cygwin/2007-07/msg00858.html].

The problem is actually caused by the following Security Update on Windows XP:

Microsoft Security Bulletin MS07-017 [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx] - Vulnerabilities in GDI Could Allow Remote Code Execution (925902).

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons.

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:34:52Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Note: Cygwin [http://www.cygwin.com] as a linux-like build environment on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008). An error appears at the "checking out files":

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The shell32, Win32 error 487 problem with git is reported on the Cygwin mailing here [http://sourceware.org/ml/cygwin/2007-07/msg00858.html].

The problem is actually caused by the following Security Update on Windows XP: Microsoft Security Bulletin MS07-017 [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx] - Vulnerabilities in GDI Could Allow Remote Code Execution (925902).

A workaround to get git clone working is to uninstall the KB925902 but this is obviously not recommended for security reasons..

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:29:44Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Please note that using Cygwin [http://www.cygwin.com] as a linux-like build environment on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008). An error appears at the "checking out files":

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The shell32, Win32 error 487 is reported on the Cygwin mailing [http://sourceware.org/ml/cygwin/2007-07/msg00858.html] but no solution is provided yet.

The problem is actually caused by the following Security Update on Windows XP: Microsoft Security Bulletin MS07-017 [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx] - Vulnerabilities in GDI Could Allow Remote Code Execution (925902). A workaround to get tyhings working again is to uninstall the KB925902 but this is obviously not recommended for security reasons..

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:27:59Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Please note that using Cygwin [http://www.cygwin.com] as a linux-like build environment on Windows XP (and possibly other Microsoft platforms) has a problem with git clone (last checked on 22 may 2008). An arror appears at the "checking out files":

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The shell32, Win32 error 487 is reported on the Cygwin mailing [http://sourceware.org/ml/cygwin/2007-07/msg00858.html] but no solution is provided yet.

The problem is actually caused by the following Security Update on Windows XP: Microsoft Security Bulletin MS07-017 [http://www.microsoft.com/technet/security/bulletin/ms07-017.mspx] - Vulnerabilities in GDI Could Allow Remote Code Execution (925902). A workaround to get tyhings working again is to uninstall the KB925902 but this is obviously not recommended for security reasons..

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-22T03:14:14Z

Trax: cause of git clone problem on XP

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Please note Cygwin on Windows XP (and possibly other Microsoft platforms) has a problem with cloning the VLC source using git (last checked on 22 may 2008). It fails on a shell32 error at the end at checking out files:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

The issue is reported on the Cygwin mailing but no solution is provided yet (see [http://sourceware.org/ml/cygwin/2007-07/msg00858.html])

The problem is caused by the following Update on Windows XP: Microsoft Security Bulletin MS07-017. Vulnerabilities in GDI Could Allow Remote Code Execution (925902). A possible workaround is to uninstall the KB925902 but this is not recommended for security reasons.

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Git

2008-05-21T21:11:32Z

Trax: /* Getting VLC source code via Git */

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Please note that for unknown reasons Cygwin on Windows XP (Vista is reported to work) does not support getting the VLC source using git at this time (12 may 2008). It fails at checking out files:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git to complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Win32CompileCygwinNew

2008-05-12T09:35:01Z

Trax: /* Git */ Cygwin problem git

This is a new version of the Win32CompileCygwin written by [[User:J-b|Jean-Baptiste Kempf]]
'''This version ONLY works for 0.9.x.'''

=Introduction=

This is a guide for Windows users with a step-by-step instruction to download, install, configure and build your VLC.

This guide uses [http://www.cygwin.com '''Cygwin'''] a Linux-like environment for Windows used for compilation of the VLC source code.

Start off by creating a VLC and a download folder on your hard drive where you can put all the installation files:

C:\VLC\
C:\VLC\Downloads

For further reference, the assumption is made that the local user will be 'Administrator'.

=Cygwin=

Download the latest [http://www.cygwin.com/cygwin/setup.exe Cygwin setup] and save it in your download location:

C:\VLC\Downloads\

More info about Cygwin can be found at http://www.cygwin.com or http://sourceware.org/cygwin

==Selecting Cygwin packages to install==

Run the setup program with the following options:

Installation type : Install from Internet (default)

Root directory : C:\cygwin (default)

Local Package directory : C:\VLC\Downloads\cygwin (your download location)

Internet Connection : Direct Connection (preferred, if it fails try another)

Download Site : Choose a download site closest to you (FTP preferred)

At the "Select Packages" section of the installation process you can select packages by clicking the button with the rotating 2 arrows. (This is under the "New" section). It shows "Skip" next to the button if the package isn't selected yet.

Clicking the button a few times will rotate through the possible package versions including "Skip" (meaning do not install or remove if installed) and "Keep" (meaning keep using the current installed version). If a package was already installed it will also show the "Current" version just to the left of it.

Select the following packages (some others will automatically be selected as well):

Archive
unzip
zip

Devel
autoconf
automake
binutils
cvs
expat
gcc
gcc-core
gcc-g++
gcc-mingw
gcc-mingw-core
gcc-mingw-g++
gdb
gettext
gettext-devel
git
libtool
make
mingw-runtime
nasm
patchutils
pkg-config
subversion

Editor
vim

Libs
libgcrypt

Web
curl (optional: for building extras/contrib)
wget (optional: for building extras/contrib)

==Cygwin environment==

Start Cygwin from the icon on your desktop (With Windows Vista run it with admin rights, so right click and select "Run as administrator"). If it runs for the first time it will automatically create a home\"username" folder in the Cygwin environment; user being the currently logged on Windows user. Assuming this is the 'Administrator' user it will create the following folder:

C:\cygwin\home\Administrator (example)

NOTE: On your desktop, you can rightclick the Cygwin icon and (in the Options field of the Cygwin Properties) set the Command history Buffer size to as large as possible: 999. This setting will make it possible to scroll back further in the Cygwin environment.

=VLC source code=

== Git ==
The very latest VLC source code can be obtained through a tool called Git. The Cygwin package we're about to install comes with an internal git component.

cd /cygdrive/c/VLC/

git clone git://git.videolan.org/vlc.git

Please note that for unknown reasons Cygwin does not support getting the VLC source using git at this time (12 may 2008). It fails at checking out files:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

== Snapshots ==

You can do the same by using the snapshots in the nightly builds site.

=Bootstrap=

Open the configure.ac file, and modify the requirement for gettext 0.17 to 0.15 (so replace line '''AM_GNU_GETTEXT_VERSION(0.17)''' with line '''AM_GNU_GETTEXT_VERSION(0.15)'''), and then run bootstrap.

cd vlc
./bootstrap

= External libraries to the source code=

VLC depends on other libraries (code) to provide some features like AC3 audio or MPEG-4 video encoding/decoding etc.

Depending on your needs you will have to install and compile some or all of these external libraries.

== Get the Win32 "contrib" package ==

A package with most of these libraries already compiled so it's actually really easy to compile a full-featured version of vlc can be found here:

http://download.videolan.org/pub/testing/win32/

Download the latest version of a "contrib" package for win32:

contrib-20060730-win32-bin-gcc-3.4.5-only.tar.bz2 (example)

Those days, you should use
http://people.videolan.org/~jb/Contribs/contrib-20080215-win32-bin-gcc-4.2.1-sjlj-runtime-3.13-only.tar.bz2

It's a good idea to check the INSTALL.Win32 file in the VLC source directory for the appropriate contrib download file.

Save it into your download location:

C:\VLC\Downloads\

==Installing the Win32 "contrib" package in Cygwin==

Start Cygwin and enter the following command in your shell:

cd /cygdrive/c/VLC/Downloads
tar xf contrib-20080215-win32-bin-gcc-4.2.1-sjlj-runtime-3.13-only.tar.bz2 -C /

Replace with your version of the "contrib" file and DON'T FORGET THE / (slash)
at the end.

This will extract the contents of the file into usr/win32 folder within your Cygwin environment.

NOTE: Make sure to DELETE your old version instead of extracting a new version on top of it.

==Keeping the Win32 "contrib" package up-to-date==

For maintenance purposes periodically check:

http://download.videolan.org/pub/testing/win32/

=Configure=

In order to make our lives just a bit easier the following section describes what commandline options should be used for compiling and those commands will then be put into a "script" that can be executed (rather than having to copy and paste all the time).

==Configure script for compiling VLC==

Create a new text document with the following lines:

PATH=/usr/win32/bin:$PATH \
PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig \
CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
LDFLAGS=-L/usr/win32/lib \
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
./configure \
--host=i686-pc-mingw32 \
--disable-gtk \
--enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
--enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
--with-ffmpeg-zlib --enable-faad --enable-flac --enable-theora \
--with-wx-config-path=/usr/win32/bin \
--with-freetype-config-path=/usr/win32/bin \
--with-fribidi-config-path=/usr/win32/bin \
--enable-live555 --with-live555-tree=/usr/win32/live.com \
--enable-caca --with-caca-config-path=/usr/win32/bin \
--with-xml2-config-path=/usr/win32/bin \
--with-dvdnav-config-path=/usr/win32/bin \
--disable-cddax --disable-vcdx --enable-goom \
--enable-twolame --enable-dvdread \
--enable-debug --enable-dca \
--disable-mkv --disable-taglib

NOTE: The following options are added for debug purposes and makes the final package a bit larger but the advantage is it's easier to debug in case of crash reports:

--disable-optimizations
--enable-debug

If you want to report a crash bug to the VLC team, it is necessary that you provide a stack backtrace. Unfortunately, Windows automatic crash reporter cannot generate such a backtrace as debug symbols used by GCC compiler aren't understood by Windows, therefore we suggest that you install Dr. MinGW (http://jrfonseca.dyndns.org/projects/gnu-win32/software/drmingw/) which will extend Windows Just-In-Time Debugger and provide the necessary debug information.

NOTE: The following options is needed for Qt4 support:

--enable-qt4

As of version 0.9.0 VLC will include the Qt interface. More information can be found about QT here: http://www.trolltech.com

The "Win32 contrib package" at present includes the linux and Windows equivalents of uic, moc and roc executables which are required for building this interface.

The linuxs executables have to be '''deleted''' from the contrib folder:

C:\cygwin\usr\win32\bin\moc (example)
C:\cygwin\usr\win32\bin\rcc (example)
C:\cygwin\usr\win32\bin\uic (example)

Save as filename in your "scripts" folder at your download/install location:

configure-vlc.sh

NOTE: Save using "All files" and not "Text files" otherwise Windows might append the extension .txt

Copy the file into your home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix configure-vlc.sh

After your configure-vlc.sh is completed, copy it to your vlc directory and run it:

./configure-vlc.sh

If it complains about permissions, use chmod and try again:

chmod 777 configure-vlc.sh

NOTE. (If you plan to use JVLC) To make vlc-control.dll accessible by Java on ''Windows'' cofigure-vlc.sh should be modified to include "-Wl,--add-stdcal-alias". Example:

...
CC="gcc -mno-cygwin -Wl,--add-stdcall-alias" CXX="g++ -mno-cygwin -Wl,--add-stdcall-alias" \
./configure \
...

===POSIX emulation layer===

VLC can be built with or without the so called POSIX emulation layer. Without is the default and is usually better (and with hasn't been tested for quite some time). If you do want to use the emulation layer, then just leave out the line with the following options:

CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"

=Compiling source code=

It's time to start Cygwin again...

==Compiling VLC==

Enter the following commands in your Cygwin shell:

cd vlc

Build it! (remember to run configure-vlc.sh before first build)

make

Cross your fingers and wait... because it might take few hours before compilation is done

==Creating self contained packages==

Once the compilation is done, you can either run VLC directly from the source tree or you can build self-contained VLC packages with the following "make" commands:

make package-win32-base

(This will create a subdirectory named vlc-x.x.x with all the binaries "stripped" without any debugging symbols).

make package-win32-zip

(Same as above but will package the directory in a zip file).

make package-win32

(Same as above but will also create an auto-installer package. You will need to have NSIS installed in its default location for this to work).

=Advanced usage=

==Updating Cygwin package versions==

If you need to update or install additional packages you can just run the Cygwin setup.exe from your download location:

C:\Downloads\cygwin\setup.exe (example)

==GDB (Gnu Debugger)==

This section requires that you installed the gdb (Gnu Debugger) in Cygwin.

This is a typical example of creating a crashlog:

cd vlc-trunk

gdb --args vlc.exe --fast-mutex --reset-config --reset-plugins-cache

NOTE: vlc-0.9.0 uses libtool for building sources, if you want to debug from the source tree, you should type the following command instead:

libtool --mode=execute gdb --args vlc --reset-config --reset-plugins-cache

In the debugger mode run the program and make sure you reset the preferences!

(gdb) run

NOTE: the (gdb) is just a prompt which means you are in the debugger mode, please note that ''--fast-mutex'' option is no longer supported in vlc-0.9.0

It will now take a lot longer than usual for VLC to start :)

Now operate VLC as you would normally do. As soon as a crash issue occurs
you'll notice a line like this:

Program received signal SIGSEGV, Segmentation fault.
0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
---Type <return> to continue, or q <return> to quit---
459 i = i_bottom + ( i_top - i_bottom ) / 2;

Now you can do a "backtrace" by using the bt command:

(gdb) bt

And output similar to this will be created:

#0 0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
#1 0x0b26bbf7 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29fef8}) at playlist.cpp:695
#2 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29e8b0}) at playlist.cpp:689
#3 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29a818}) at playlist.cpp:689
#4 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x299718}) at playlist.cpp:689
#5 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0xffff0000}) at playlist.cpp:689
#6 0x0b26bf49 in wxvlc::Playlist::AppendItem (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:564
#7 0x0b2757fc in wxvlc::Playlist::OnPlaylistEvent (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:1438
#8 0x0b3771b8 in wxEvtHandler::ProcessEventIfMatches ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#9 0x0b376a1c in wxEventHashTable::HandleEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#10 0x0b37730d in wxEvtHandler::ProcessEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#11 0x0b37711b in wxEvtHandler::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
---Type <return> to continue, or q <return> to quit---
#12 0x0b376017 in wxAppConsole::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#13 0x0b3ec75a in wxIdleWakeUpModule::MsgHookProc ()
at /usr/win32/include/wx-2.6/wx/bmpbuttn.h:81
#14 0x773aca2d in USER32!GetScrollRange ()
from /cygdrive/c/WINDOWS/system32/user32.dll
#15 0x00000000 in ?? () from
(gdb)

To backtrace all the running threads use:

(gdb) thread apply all bt

These are the log outputs that are more usefull to developers than just mentioning "it crashes"!

NOTE: In GDB mode there are sometimes situations where GDB initially "crashes" on certain network activity (opening network shares, network traffic) which in normal operation does not occur. Just select c for continue until "normal" operation continues.

== Common errors ==
===vlc.exe: Permission denied===

A make finished successfully and produced vlc.exe, but running the executable returns the following:

bash: ./vlc.exe: Permission denied

The permissions on both vlc.exe & vlc.exe.manifest must be set to executable.

FIX: Type the following:

chmod 755 vlc.exe vlc.exe.manifest

===error: parse error before '(' token===

A make (compile) of FFmpeg results in the following error:

/usr/include/sys/unistd.h:203: error: parse error before '(' token
make[1]: *** [ffm.o] Error 1

It's very likely you are usix the POSIX emulater which you shouldn't...

FIX: compile with the option

-mno-cygwin

==error: expected primary-expression before '<<' token==

In file included from /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32
api/windows.h:52,
from ../../../include/vlc_common.h:459,
from ../../../include/vlc/vlc.h:153,
from dshow.cpp:31:
/usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32api/wingdi.h:3:1: warn
ing: this is the location of the previous definition
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:14: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:5552: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:45,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/strmif.h:2: warning: ignoring #pragma warning
In file included from /usr/win32/include/dsound.h:13,
from /usr/win32/include/amaudio.h:18,
from /usr/win32/include/dshow.h:47,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/d3dtypes.h:22: warning: ignoring #pragma warning
/usr/win32/include/d3dtypes.h:1813: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:48,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/control.h:2: warning: ignoring #pragma warning
dshow.cpp: In function `int CommonOpen(vlc_object_t*, access_sys_t*, vlc_bool_t)
':
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<' token
dshow.cpp:456: error: expected primary-expression before '.' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '=' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>' token
dshow.cpp:484: error: expected primary-expression before '.' token
dshow.cpp:485: error: expected `;' before "IAMCrossbar"
dshow.cpp:491: error: `pXbar' undeclared (first use this function)
dshow.cpp:491: error: (Each undeclared identifier is reported only once for each
function it appears in.)
make[6]: *** [libdshow_plugin_a-dshow.o] Error 1
make[6]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[5]: *** [all-modules] Error 1
make[5]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/Administrator/vlc-trunk/modules/access'
make[3]: *** [all] Error 2

Basically in case of conflict svn adds "<<< mine" and "=======" and ">>>> r1242" which makes gcc complain.

FIX: revert the offending file

==Objective C source seen but `OBJC' is undefined==

The configure process stops halfway.

+ aclocal-1.9 -I m4
+ autoconf
+ autoheader
+ automake-1.9 --add-missing --copy -Wall
configure.ac: installing `autotools/install-sh'
configure.ac: installing `autotools/missing'
activex/Makefile.am:143: shell $(VLC_CONFIG: non-POSIX variable name
activex/Makefile.am:143: (probably a GNU make extension)
activex/Makefile.am: installing `autotools/compile'
activex/Makefile.am: installing `autotools/depcomp'
modules/gui/macosx/Makefile.am: Objective C source seen but `OBJC' is undefined
modules/misc/testsuite/Makefile.am: Objective C source seen but `OBJC' is undefi
ned
src/Makefile.am: Objective C source seen but `OBJC' is undefined
Makefile.am:282: user target `vlc$(EXEEXT)' defined here...
/usr/share/automake-1.9/am/program.am: ... overrides Automake target `vlc$(EXEEX
T)' defined here
Makefile.am:230: while processing program `vlc'
make: *** No targets specified and no makefile found. Stop.

This problem is related to a warning earlier on and only occured in a few revisions where a built-in workaround wasn't working properly:

+ echo 'Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.'
Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.

FIX: update autoconf to 2.60 or newer. If Cygwin doesn't provide this version yet then build it yourself from extras/contrib.

Enter the following commands in your Cygwin shell:

cd vlc-trunk/extras/contrib

./bootstrap

cd src

make .autoconf

There should now be compiled autoconf version (probably 2.60 or newer) in extras/contrib that the bootstrap process will use.

Now start the whole "Compile VLC" process from the start again.

==Error: cannot create temporary file for diversion: Permission denied==

If the above error appears, it might mean you don't have the TMPDIR defined in cygwin. You will need to define it and have its value point to your temporary directory. You can use '''export TMPDIR="/cygdrive/c/temp"''' or any directory for it (/cygdrive/c/temp is same as C:\temp). If this doesn't help, make sure you run cygwin with admin rights (With Windows Vista, right click cygwin shortcut and select "Run as administrator"). Avira AntiVir might also cause issues to m4, so disabling it while ./bootstrap might help.

=Version=

20050627 Initial version

20050628 Updated some more exceptions

20050628 Some info added about FFmpeg compiling with AMR

20050629 Finalized FFmpeg compiling

20050630 Cross-compiling

20050724 Some extra compile explanations

20050726 Removed cross-compiling (was for linux -> win32) Patching source code with .diff files

20050823 Added zlib error

20050923 --enable-sdl --with-sdl-config-path=/usr/win32/bin added to configure. Added debug section

20051102 Changed FFmpeg lib names

20051128 Detailed Cygwin upgrade/downgrade for gcc 3.3. Renamed some update scripts. Added FFmpeg CVS update. --disable-gnomevfs added to configure (only used on linux)

20060121 PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig added to configure

20060128 Added curl and libtool to Cygwin for those that want to be able to build extras/contrib themselves

20060217 Added make install-libs install-headers to FFmpeg compile

20060222 Remark about missing "gettext" libs for Cygwin during install

20060225 ./bootstrap: you need libtool

20060618 Updated GCC to 3.4 version and added FFmpeg SVN and DTS support

20060805 Added note about using older binutils and gdb for Cygwin!

20060915 Added note about updating autoconf from extras/contrib for an OBJC problem during configure

20061108 Added note this document is no longer usable since Cygwin has been unusable probably related to some bash/dos2unix change

20070612 Added note about --enable-dca

20080228 New version by [[User:J-b|jb]]

20080307 Added --host=i686-pc-mingw32 option to the configure script

20080311 Simplification

20080323 Added some tips for Vista

[[Category:Building]]
[[Category:Coding]]

Git

2008-05-12T09:30:11Z

Trax: /* Getting VLC source code via Git */ Cygwin problem git

= Basic Git usage =
== Getting VLC source code via Git ==
$ git clone git://git.videolan.org/vlc.git
Voilà! The full VLC history should be on your hard disk in vlc/. Type

Please note that for unknown reasons Cygwin does not support getting the VLC source using git at this time (12 may 2008). It fails at checking out files:

$ 2 [main] git 4012 D:\cygwin\bin\git.exe:
*** fatal error - could not load shell32, Win32 error 487

You can also clone using http with out repo.or.cz mirror.
$ git clone http://repo.or.cz/r/vlc.git

$ git log
to see the full log of the trunk.
$ gitk
to see the log graphically.

You can also browse the sources via [http://git.videolan.org/ gitweb].

== Configure your global git config ==
=== Personal Information ===
Tell git your name. (use mostly by git-commit)
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

=== Using git with color (Tip) ===
If you want to use git with colored output use:
$ git config --global color.ui true

If you are using an old git version (prior to 1.5.5) and previous command didn't work, use:
$ git config --global color.diff auto
$ git config --global color.status auto
$ git config --global color.branch auto

=== Setting up "git up" (Tip) ===
If you want to be able to just keep in sync using "git up" use:
$ git config --global alias.up "pull --rebase"
And if you like your tree to be messy and don't want git too complain (like in svn) use:
$ git config --global alias.up '!sh -c "git stash && git pull --rebase && git stash apply"'

=== Setting up "git wu" (Git What's Up) (Tip) ===
If you want to see what you are about to "git push":
$ git config --global alias.wu "log --stat origin..@{0}"
Now use:
$ git wu

=== Setting up "git wup" (Git What's Up - with patch) (Tip) ===
If you want to see what you are about to "git push", along with the diff:
$ git config --global alias.wup "log -p origin..@{0}"
Now use:
$ git wup

== General GIT Workflow ==
1. Make your file edits in your local repository.

2. "git commit" the changes in your local repository

3. "git pull --rebase" or "git up" (if you did ''git config --global alias.up "pull --rebase"'') to bring the rest of your local repository up to date

4. "git log origin..master" to check what you are going to commit

4. "git push" to move your changes up to the master

"git stash" if you want to "hide" your changes. Do this if you think there may be other commits against ther same things you are working on, want to refresh yourself (using a git pull --rebase) from the master. Use "git stash apply" to get your stash back.

"git checkout -f master" if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository.

== List the local branch ==
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch
* master

== List your local non committed changes ==
$ git status | less

== Commit ==
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit '''locally''' your work by
$ git commit -a
or
$ git commit <specific files>

== List your commits ==
$ git log

== Keeping your local working branch in sync ==
$ git pull --rebase

To shorten up that command type
$ git config --global alias.up "pull --rebase"

Now you can just type:
$ git up

== Use a graphical interface ==
$ gitk # Tree Browser
$ qgit # Tree Browser
$ git-gui # Commit/push/... editor

== Submitting patches to the vlc-devel ==

First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List| Check List]].

If you have been developing on vlc locally and (still) don't have write access, you can submit all your commit in one shot using:
$ rm -Rf patches
$ git format-patch -o patches origin
$ git-send-email --to vlc-devel@videolan.org patches
If you have multiple patch consider using:
$ git-send-email --compose --no-chain-reply-to --to vlc-devel@videolan.org patches
which will produce the patches for each local commit in the directory "patches" and send them.
--no-chain-reply-to make sure it doesn't reply do
* [PATCH 0/m]
** [PATCH 1/m]
*** [PATCH 2/m]
**** ...
But :
* [PATCH 0/m]
** [PATCH 1/m]
** [PATCH 2/m]
** ..

= Advanced usage =
== Creating a secondary local branch ==
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Which could be summarized by:
$ git checkout -b mywork

Then do some commit on it... And you can go back to your original master branch by doing:
$ git checkout master

== Fetching a remote branch ==
To see the remote branch use:
$ git branch -r
If the remote branch is named 0.8.6-bugfix
$ git branch 0.8.6-bugfix origin/0.8.6-bugfix
Branch 0.8.6-bugfix set up to track remote branch refs/remotes/origin/0.8.6-bugfix.
$ git branch
0.8.6-bugfix
* master
To checkout that branch use:
$ git checkout 0.8.6-bugfix
To stay up-to-date a simple
$ git pull --rebase
Should be enough.

To push to the remote branch, use:
$git push origin 0.8.6-bugfix:0.8.6-bugfix

== Creating a remote branch ==
If the new remote branch is named 0.9.0-bugfix, and is based on the local master branch.
First make sure everything go as planned with the --dry-run option:
$ git push --dry-run origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable

Then push it:
$ git push origin master:refs/heads/0.9.0-stable
To git@git.videolan.org:vlc.git
* [new branch] master -> 0.9.0-stable
$ git branch -r
origin/0.9.0-stable
origin/master

To checkout that branch now see ''Fetching a remote branch''

== Publishing your own fork ==
Goto [http://repo.or.cz/w/vlc.git http://repo.or.cz/w/vlc.git] and click [http://repo.or.cz/m/regproj.cgi?name=vlc/ fork]. You will be able to publish your work there.

Please don't forget to send a mail to the vlc-devel as soon as you create your fork.

== Revert your non-committed local changes ==
$ git checkout -f

==Edit or undo not yet pushed commits ==
This will undo the last commit
$ git reset HEAD^
which is the same as
$ git reset master^
(if you are checked-out copy of your tree is master)
And also the same as
$ git reset a44a594 # note that there is no need to use the full sha id

If you have a stack of patch that you have not yet committed you can delete one patch from the list using git rebase --interactive
$ git rebase --interactive origin
pick eacf185 test
pick 56322eb VLMA owner is vlma prod.

# Rebase 826757e..56322eb onto 826757e
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit

== Diff-ing ==
* You can diff between two branches using
$ git diff branch1 branch2
* You can diff between the previous 10th commit and current using
$ git diff HEAD~10 HEAD
* You can diff between the previous 10th commit and current of the branch "mywork" using
$ git diff mywork~10 mywork
* Imagine that git log is like
$ git log
commit e0394f269305edd09843257e7c1d1a66aaf48ab3
Author: jb <jb>
Date: Fri Apr 13 07:14:48 2007 +0000
qt4 - Mousewheel (2)
commit e80b339081aa6755f67c9bd8e2aacf93a9a79d95
[..]
commit ff7004b70fd239e4120deb160e2991bd5237b8df
[..]
commit a44a594898f981a145cfcace5f16f8973f9eb46f
[..]
commit 690df705c963cf6bf6f5746d54bc97a85ff91919
[..]
commit 679f8b1c3e0baa469efa970588b95a625c595d64
[..]

$ git diff a44a594898f981a145cfcace5f16f8973f9eb46f~2 e80b339081aa6755f67c9bd8e2aacf93a9a79d95
Will be equivalent to:
$ git diff ff7004b70fd239e4120deb160e2991bd5237b8df e80b339081aa6755f67c9bd8e2aacf93a9a79d95
And to:
$ git diff HEAD~4 HEAD^

* Remember that to produce a patch you should rather use git-format-patch than git-diff most of the time.

== Tracking regression ==
git has a great tool called [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
$ git bisect start
$ git bisect bad # tell git current version has the bug you are tracking
$ git bisect good 0.8.6 # tell git 0.8.6 didn't has the bug
And then git will checkout a certain revision, and ask you to test it. And you simply say whether this version has the bug.
If it has the bug:
$ git bisect bad
if the bug is not present:
$ git bisect good
And so on by bisection... At the end git will indicate the faulty commit. Most of the time this tool is really efficient to track regression.

If you can provide a script that test the presence of the bug
$ git bisect run <script_name>
will be able to track down the regression by itself. See [http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

= Using Git to push to VideoLAN git =
== Initial requirement ==
* Make sure you've set your name and email in your commits
$ git config --global user.name "Your Name"
$ git config --global user.email "me@example.com"

== Convert your tree to use your ssh push commit access ==
$ vi vlc/.git/config
And replace git://git.videolan.org/vlc.git by git@git.videolan.org:vlc.git

== Staying up to date ==
$ git pull --rebase

If you don't want to have to type --rebase everytime you pull do:
$ git config branch.master.rebase true

This one creates a merge object which is not how SVN worked, so let's use the first version...
$ git pull

== Pushing your work ==
$ git log origin..master # Check what you are going to push
$ git push



= Documentation about git =
* [http://git.or.cz/ Official Git Website]
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

[[Category:Building]]

Win32CompileCygwinOld

2008-04-29T22:28:36Z

Trax: updated cygwin package versions and note about old mingw-runtime

Cygwin environment for Windows from http://developers.videolan.org/vlc/cygwin-compile.txt

Originally based on "Win32 Cygwin Environment" Rev. B (20041003) by Mark Moriarty and "Win32 Compile HOWTO" (20050513) by Gildas Bazin and Olivier Teulière.

=Introduction=

This is a guide for Windows users with a step-by-step instruction to download, install and configure the following components on your system:

* [http://www.cygwin.com '''Cygwin''']: Linux-like environment for Windows used for compilation of the VLC source code

* [http://download.videolan.org/pub/videolan/testing/win32/ '''Win32 contrib package''']: Precompiled library package (with DTS support).

Optionally updated libraries:

* [http://ffmpeg.mplayerhq.hu '''FFmpeg'''] (with AMR support).

* [http://developers.videolan.org/x264.html '''x264'''] used for encoding H.264/AVC video.

* [http://www.live555.com '''live555'''] (formerly known as live.com) for RTP/RTCP/RTSP/SIP multimedia streaming.

The best approach to start getting comfortable with building VLC from source is to use the precompiled library package and not yet the optionally updated ones.

Start off by creating a download folder on your hard drive where you can put all the installation files:

C:\Downloads (example)

For further reference, the assumption is made that the local user will be 'Administrator'.

=Cygwin=

More info about Cygwin can be found at http://www.cygwin.com or http://sourceware.org/cygwin

Download the latest [http://www.cygwin.com/cygwin/setup.exe Cygwin setup] (it's at the install or update now icon on the site) and save it in your download location:

C:\Downloads\cygwin (example)

==Selecting Cygwin packages to install==

Run the setup program with the following options:

Installation type : Install from Internet (default)

Root directory : C:\cygwin (default)

Local Package directory : C:\Downloads\cygwin (your download location)

Internet Connection : Direct Connection (preferred, if it fails try another)

Download Site : Choose a download site closest to you (FTP preferred)

At the "Select Packages" section of the installation process you can select packages by clicking the button with the rotating 2 arrows. (This is under the "New" section). It shows "Skip" next to the button if the package isn't selected yet.

Clicking the button a few times will rotate through the possible package versions including "Skip" (meaning do not install or remove if installed) and "Keep" (meaning keep using the current installed version). If a package was already installed it will also show the "Current" version just to the left of it.

Select the following packages (some others will automatically be selected as well):

Archive
5.52-2 unzip (recommended: goes hand in hand with zip utility)
2.23-2 zip (required: to make self contained zip packages)

Devel
2.1 automake (at least 1.5 is required)
20060817-1 binutils (autoselected)
1.11.22-1 cvs (required for autopoint)
3.4.4-3 gcc-core (autoselected)
3.4.4-3 gcc-g++
20040810-1 gcc-mingw
20050522-1 gcc-mingw-core (autoselected)
20050522-1 gcc-mingw-g++ (autoselected)
6.8-2 gdb (optional: for debugging purposes)
0.15-1 gettext (autoselected)
0.15-1 gettext-devel
1.5.5.1-1 git
1.5.27a-1 libtool
3.81-2 make
'''3.13-1 mingw-runtime''' (autoselected)
2.02-1 nasm (optional: for compiling x264 encoder)
0.2.31-1 patchutils (optional: for patching source files with .diff files)
0.23a-1 pkgconfig (recommended: otherwise ./configure will complain about accuracy)
1.4.5-2 subversion

Lib
1.4.0-1 libgcrypt

Web
7.16.3-1 curl (optional: for building extras/contrib)
1.10.2-2 wget (optional: for building extras/contrib)

The package version numbers happen to be the representation of what was the most current version available at the time this article/section was updated (20080430) '''with the exception of mingw-runtime which has to be downgraded to 3.13-1 for proper usage'''.

If you run into problems of missing packages during install (particularly gettext: cyggettextsrc-0-14-1.dll not found) then rerun the setup program and try selecting another Download Site from the mirror list.

NOTE: Whenever new packages are installed or updated through the Cygwin installer, make sure not to update the packages by keeping the old versions (using the "Keep" option).

==Installing older GCC 3.3 version==

The gcc version used for compilation should match the version specified in the "contrib" package, at present gcc-3.4.5-only.

So the preferred version to use is GCC 3.4 but for historical reasons this section descibes what version to use together with an older gcc-3.3.1-only "contrib" package. The 3.3.1 version is not available in Cygwin but 3.3.3-3 (still) is.

The only compatibility issue with using GCC 3.4 and the precompiled 3.3.1 "contrib" package is that it doesn't support the compiling of the matroska container .mkv so that leaves 2 options; use gcc 3.3.3-3 with a 3.3.1-only "contrib" or gcc 3.4 (or newer) but disable matroska support.

The second option requires you to add the following line to the configure options:

--disable-mkv

If you use the older gcc-g++ and gcc-core versions you have to change the gcc-mingw-core and gcc-mingw-g++ back to the older versions as well.

Select the following package versions instead:

Devel
'''3.3.3-3''' gcc-core
'''3.3.3-3''' gcc-g++
20040810-1 gcc-mingw
'''20040810-1''' gcc-mingw-core
'''20040810-1''' gcc-mingw-g++

NOTE: The gcc-3.4.5-only "contrib" package should compile just fine with GCC 3.3

==Cygwin environment==

Start Cygwin from the icon on your desktop. If it runs for the first time it will automatically create a home\"username" folder in the Cygwin environment; user being the currently logged on Windows user. Assuming this is the 'Administrator' user it will create the following folder:

C:\cygwin\home\Administrator (example)

NOTE: On your desktop, you can rightclick the Cygwin icon and (in the Options field of the Cygwin Properties) set the Command history Buffer size to as large as possible: 999. This setting will make it possible to scroll back further in the Cygwin environment.

=VLC source code=

== SVN ==
The very latest VLC source code can be obtained through a tool called SVN (Subversion). The Cygwin package we're about to install comes with an internal subversion component. Using this one is the preferred method.

Read the [[SVN]] page.

== GIT ==
As of March 2008, VLC has switched to a GIT repository.
If you only need read access, you can continue to use SVN to obtain the latest VLC trunk.
If you need write (commit) access, you need the Cygwin ssh (Secure Shell), procps, and GIT packages.
To see if you have them, in a bash shell enter:
ssh --help
git --help
pskill --help

If you don't have them, run Cygwin's setup.exe, and download/install them.
For secure shell, generate keys and send the public key (e.g., the file cygwin/home/your_username/.ssh/id_rsa.pub) to the proper vlc admin (check in on IRC for more information).
Then, update your Cygwin.bat file, so it looks like:
@echo off
set CYGWIN=binmode
C:
chdir C:\cygwin\bin
c:\cygwin\bin\pkill ssh-agent
del c:\cygwin\etc\profile.d\ssh-agent.sh
c:\cygwin\bin\ssh-agent > c:\cygwin\etc\profile.d\ssh-agent.sh
bash --login -i
(Change the "C:\" as appropriate)

And update your cygwin\etc\profile file, adding the following at the bottom:
ssh-add

The above changes will kill any pre-existing ssh-agent, start a new instance of it, and automatically prompt you for your ssh passphrase when the bash shell opens.

For general VLC git usage, see: http://wiki.videolan.org/Git#Basic_Git_usage

git-gui appears to work well under Cygwin, provides a fairly simple UI.

== Snapshot ==
Another way of obtaining source code is by downloading a daily code "snapshot" from the following location:

http://nightlies.videolan.org/build/source

Download the latest snapshot:

vlc-snapshot-20080112.tar.gz (example)

and save it into a subfolder in your download location:

C:\Downloads\VLC\src (example)

Check if the downloaded file has not been renamed by Internet Explorer in your download folder to something with the extension .tar.tar and if so then simple rename the files back to .tar.gz

= External libraries to the source code=

VLC depends on other libraries (code) to provide some features like AC3 audio or MPEG-4 video encoding/decoding etc.

Depending on your needs you will have to install and compile some or all of these external libraries.

== Win32 "contrib" package ==

A package with most of these libraries already compiled so it's actually really easy to compile a full-featured version of vlc can be found here:

http://download.videolan.org/pub/testing/win32/

Download the latest version of a "contrib" package for win32:

contrib-20060730-win32-bin-gcc-3.4.5-only.tar.bz2 (example)

It's a good idea to check the INSTALL.Win32 file in the VLC source directory for the appropriate contrib download file.

Save it into a subfolder in your download location:

C:\Downloads\VLC\contrib (example)

Check if the file has not been renamed by Internet Explorer in your download folder to something with the extension .tar.tar and if so then simply rename the file back to .tar.bz2

Also remember the "gcc-3.4.5" part in the "contrib" package filename since it relates to the GCC version that needs to be installed in Cygwin lateron!

== Adding additional or updated libraries to the source (optional) ==

Most of them can be found here (source code):

http://download.videolan.org/pub/testing/contrib/

It is advised not to recompile those libraries.

Updated libraries for FFmpeg and x264 are available through SVN (which is discussed in a later stage of this guide).

===live555 "snapshot" (optional)===

More info about live555 can be found at:

http://www.live555.com

The project source code is available here:

http://live555.com/liveMedia/public/

Download the latest snapshot:

live.2007.01.11.tar.gz (example)

NOTE: live555-latest.tar.gz is also the latest version but keeping the date in the filename makes it easier to reference.

and save it into a subfolder in your download location:

C:\Downloads\VLC\src (example)

Check if the downloaded file has not been renamed by Internet Explorer in your download folder to something with the extension .tar.tar and if so then simple rename the files back to .tar.gz

=Getting the latest sources=

In order to have the latest source code you have to download this using SVN.

Create a new folder at your download/install location:

C:\Downloads\VLC\scripts (example)

==SVN update script for VLC==

Create a new text document with the following line:

svn checkout svn://svn.videolan.org/vlc/trunk vlc-trunk

Save as filename in your "scripts" folder at your download/install location with the option "All Files" and not "Text Documents"

update-vlc.sh (example)

This command will download a complete svn trunk.

Copy the script file into your Cygwin "home directory":

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix update-vlc.sh

This is for converting the 'line endings' made by Windows/DOS (in which the text document was created) to UNIX style.

==SVN update scripts for additional libraries (optional)==

Updating source code using SVN for additional libraries such as x264 or FFmpeg works the same way.

===SVN update scripts for x264 (optional)===

Create a new text document with the following line:

svn checkout svn://svn.videolan.org/x264/trunk x264-trunk

Save as filename in your "scripts" folder at your download/install location:

update-x264.sh

Copy the script file into your Cygwin "home directory":

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix update-x264.sh

===SVN update script for FFmpeg (optional)===

Create a new text document with the following line:

svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-trunk

Save as filename in your "scripts" folder at your download/install location:

update-ffmpeg.sh

Copy the script file into your Cygwin "home directory":

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix update-ffmpeg.sh

=="Checking out" the latest source code from SVN==

Start Cygwin and enter the following command in your shell:

./update-vlc.sh

This will download the current "subversion trunk" (latest code) into your home directory into the directory specified in your shell script:

C:\cygwin\home\Administrator\vlc-trunk (example)

At the end of the command it will show something like "Checked out revision 18561".

The vlc-trunk folder will get over-written/updated the next time you run the command. If you want to save a so called "snapshot" of the existing vlc-trunk, rename or copy the current directory into something desired (like vlc-trunk-20070112).

NOTE: Updating the source code for additional libraries such as x264, FFmpeg etc. is done by running their corresponding update scripts.

==Extracting the source from a "snapshot"==

If you are not using SVN to obtain the latest source code but are using a daily "snapshot" then copy that source package from your download/install location to the Cygwin home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

tar xvf vlc-snapshot-20070112.tar.gz (example)

Replace with your version of the source package.

This will extract the contents of the file into a subfolder within your Cygwin environment with the naming convention something like:

vlc-0.9.0-svn (example)

=Installing the Win32 "contrib" package in Cygwin=

First the additional libraries have to be "installed" in Cygwin.

==Extracting the Win32 "contrib" package==

Copy the "contrib" package from your download/install location to the home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

tar xjvf contrib-20061202-win32-bin-gcc-3.4.5-only.tar.bz2 -C / (example)

Replace with your version of the "contrib" file and DON'T FORGET THE / (slash)
at the end.

This will extract the contents of the file into usr/win32 folder within your Cygwin environment.

NOTE: Make sure to DELETE your old version instead of extracting a new version on top of it.

==Keeping the Win32 "contrib" package up-to-date==

For maintenance purposes periodically check:

http://download.videolan.org/pub/testing/win32/

to see if a newer "contrib" is available. If that is the case you should DELETE the existing directory structure which is for the precompiled "contrib" package:

C:\cygwin\usr\win32 (example)

Download the newer file and follow the installation instructions the same as before so you will end up with the most up-to-date version.

NOTE: Make sure to DELETE your old version instead of extracting a new version on top of it.

=Configure scripts=

In order to make our lives just a bit easier the following section describes what commandline options should be used for compiling and those commands will then be put into a "script" that can be executed (rather than having to copy and paste all the time).

==Configure script for compiling VLC==

Create a new text document with the following lines:

CONTRIB_TREE=/usr/win32
PATH=${CONTRIB_TREE}/bin:$PATH \
./bootstrap && \
CPPFLAGS="-I${CONTRIB_TREE}/include -I${CONTRIB_TREE}/include/ebml" \
LDFLAGS=-L${CONTRIB_TREE}/lib \
PKG_CONFIG_LIBDIR=${CONTRIB_TREE}/lib/pkgconfig \
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
./configure \
--host=i686-pc-mingw32 \
--enable-sdl --with-sdl-config-path=${CONTRIB_TREE}/bin --disable-gtk \
--enable-nls \
--enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
--with-ffmpeg-zlib --enable-faad --enable-flac --enable-theora \
--with-wx-config-path=${CONTRIB_TREE}/bin \
--with-freetype-config-path=${CONTRIB_TREE}/bin \
--with-fribidi-config-path=${CONTRIB_TREE}/bin \
--enable-live555 --with-live555-tree=${CONTRIB_TREE}/live.com \
--enable-caca --with-caca-config-path=${CONTRIB_TREE}/bin \
--with-xml2-config-path=${CONTRIB_TREE}/bin \
--with-dvdnav-config-path=${CONTRIB_TREE}/bin \
--disable-cddax --disable-vcdx --enable-goom \
--enable-twolame --enable-dvdread \
--disable-gnomevfs \
--enable-dts \
--disable-optimizations \
--enable-debug \

NOTE: The following option is added for DTS Coherent Acoustics streams decoding support. The latest "contrib" package should already contain libdca (formerly known as libdts) needed to compile this but at present it's disabled by default:

--enable-dts

NOTE: For VLC 0.9.0, replace the previous option by:

--enable-dca

NOTE: The following options are added for debug purposes and makes the final package a bit larger but the advantage is it's easier to debug in case of crash reports:

--disable-optimizations
--enable-debug

If you want to report a crash bug to the VLC team, it is necessary that you provide a stack backtrace. Unfortunately, Windows automatic crash reporter cannot generate such a backtrace as debug symbols used by GCC compiler aren't understood by Windows, therefore we suggest that you install Dr. MinGW (http://jrfonseca.dyndns.org/projects/gnu-win32/software/drmingw/) which will extend Windows Just-In-Time Debugger and provide the necessary debug information.

NOTE: The following options is needed for QT4 support:

--enable-qt4

As of version 0.9.0 VLC will include the QT interface. More information can be found about QT here: http://www.trolltech.com

The "Win32 contrib package" at present only includes the linux equivalents of uic, moc and roc executables which are required for building this interface.

The linues executables have to be '''deleted''' from the contrib folder:

C:\cygwin\usr\win32\bin\moc (example)
C:\cygwin\usr\win32\bin\rcc (example)
C:\cygwin\usr\win32\bin\uic (example)

The moc, rcc and uic.exe from the [http://www.trolltech.com/developer/downloads/qt/windows Qt/Windows Open Source Edition] (these can be found in the bin folder after installation) have to be placed in the contrib folder:

C:\cygwin\usr\win32\bin\moc.exe (example)
C:\cygwin\usr\win32\bin\rcc.exe (example)
C:\cygwin\usr\win32\bin\uic.exe (example)

Save as filename in your "scripts" folder at your download/install location:

configure-vlc.sh

NOTE: Save using "All files" and not "Text files" otherwise Windows might append the extension .txt

Copy the file into your home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix configure-vlc.sh

===POSIX emulation layer===

VLC can be built with or without the so called POSIX emulation layer. Without is the default and is usually better (and with hasn't been tested for quite some time). If you do want to use the emulation layer, then just leave out the line with the following options:

CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"

===VLC optional settings===

The following option should be used when compiling using the GCC 3.4 version with older "contrib" gcc-3.3.1-only:

--disable-mkv

==Configure scripts for compiling additional libraries (optional)==

The following section is optional. The "contrib" package contains precompiled libraries but it is possible to update some of those libraries to the most current versions such as x264 and FFmpeg.

===FFmpeg with AMR support (optional)===

The AMR (Adaptive Multi Rate) codec is designed to encode and decode speech with acceptable quality for transmission over relatively low bandwidth channels with minimal latency, typically used in mobile networks (3GP) or voice message applications.

The AMR codec is usually referred to as:

Narrow Band (AMR-NB, fourcc samr) for low quality
Wide Band (AMR-WB, fourcc samw) for high quality

The sources for AMR are not compatible with the GPL (General Public License). AMR support is disabled by default.

====Getting the AMR reference codecs (optional)====

The AMR reference codecs can be found on the 3GPP site http://www.3gpp.org at the following download location for zipped source code packages:

http://www.3gpp.org/ftp/Specs/2004-03/Rel-5/26_series/

Download the following 3 packages to a subfolder in your download/install location:

C:\Downloads\VLC\src (example)

1. AMR - latest 26073 package:

http://www.3gpp.org/ftp/Specs/2004-03/Rel-5/26_series/26073-530.zip (example)

3GPP TS 26.073 V5.3.0 (2004-03) ANSI-C code for the Adaptive Multi Rate (AMR) speech codec (Release 5)

2. AMR_FLOAT - latest 26104 package:

http://www.3gpp.org/ftp/Specs/2004-03/Rel-5/26_series/26104-540.zip (example)

3GPP TS 26.104 V 5.4.0 (2004-03) ANSI-C code for the Floating-point Adaptive Multi Rate (AMR) speech codec (Release 5)

3. AMRWB_FLOAT - latest 26204 package:

http://www.3gpp.org/ftp/Specs/2004-03/Rel-5/26_series/26204-520.zip (example)

3GPP TS 26.204 V5.2.0 (2003-09) ANSI-C code for Floating-point Adaptive Multi Rate Wideband (AMR-WB) speech codec (Release 5)

====Extracting the AMR reference codecs (optional)====

The following AMR reference packages should now be in your download/install location:

26073-530.zip (example)
26104-540.zip (example)
26204-520.zip (example)

Using your favourite unzipper (Windows internal extraction wizard, WinZIP, WinRAR etc.) extract the zip files in the into the current folder (Windows wizard would use "Extract All" and WinZIP or WinRAR would use "Extract to 'foldername' which is the same as the .zip package name").

This will create the following folders:

C:\Downloads\VLC\src\26073-530
C:\Downloads\VLC\src\26104-540
C:\Downloads\VLC\src\26204-520

Within those folders another .zip package exists. Again unpack those zip files into the current folder:

26073-530_ANSI_C_source_code
26104-540_ANSI_C_source_code
26204-520_ANSI-C_source_code

Now each unpacked source code package has an individual folder named "c-code".

Rename the c-code subfolders within each package to amr, amr_float and amrwb_float:

C:\Downloads\VLC\src\26073-530\26073-530_ANSI_C_source_code\c-code to amr
C:\Downloads\VLC\src\26104-540\26104-540_ANSI_C_source_code\c-code to amr_float
C:\Downloads\VLC\src\26204-520\26204-520_ANSI-C_source_code\c-code to amrwb_float

NOTE: the 530, 540 to 520 order looks a bit confusing but those are actually just version numbers and the folders are shown in the correct alphabetical order.

Copy each of the the following folders (including content, so just select the whole folders itself):

amr
amr_float
amrwb_float

to the Cygwin home directory in the libavcodec subfolder of where the FFmpeg package resides:

C:\cygwin\home\Administrator\ffmpeg-trunk\libavcodec (example)

===FFmpeg configure script with "contrib" package (optional)===

NOTE: This compile script assumes you are also using the same FFmpeg version as is used in the "contrib" package (this is why the cflags and ldflags also point to the win32 folder where the "contrib" package was extracted).

Create a new text document with the following lines:

./configure --enable-mingw32 --enable-memalign-hack \
--extra-cflags=-I/usr/win32/include \
--extra-ldflags=-L/usr/win32/lib \
--prefix=/usr/win32 \
--cc="gcc -mno-cygwin" \
--enable-faac --enable-mp3lame --enable-pp --enable-gpl --log \

NOTE: For AMR encoding/decoding support also add the following options:

--enable-amr_nb --enable-amr_wb

NOTE: VLC uses the x264 lib directly and not through ffmpeg so there is no need to add --enable-x264

Save as filename in your "scripts" folder at your download/install location:

configure-ffmpeg.sh (example)

NOTE: Save using "All files" and not "Text files" otherwise Windows might append the extension .txt

Copy the file into your home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix configure-ffmpeg.sh

===FFmpeg configure script for FFmpeg "stand-alone" (optional)===

This section is only if FFmpeg compiling is required as a stand-alone package and not in combination with the precompiled "contrib" package.

In case of failure to compile VLC with different settings (added/updated libraries to the "contrib") it is advisable to test if FFmpeg does compile OK just in "stand-alone" mode.

Create a new text document at the download location with following lines:

./configure --enable-mingw32 --enable-memalign-hack \
--cc="gcc -mno-cygwin" \
--enable-pp --enable-gpl --log \

NOTE: When including libraries the following options should be added/changed, pointing to the appropriate folder where does libraries are located (for VLC "contrib" that would be /usr/win32 but in other situations it might be the default /usr/local):

--extra-cflags=-I/usr/local/include \
--extra-ldflags=-L/usr/local/lib \
--prefix=/usr/local \

Save as filename in your "scripts" folder at your download/install location:

configure-ffmpeg-svn.sh (example)

Start Cygwin and enter the following command in your shell:

dos2unix configure-ffmpeg-svn.sh

==x264 configure script (optional)==

Create a new text document with the following lines:

./configure \
--prefix=/usr/win32 \

NOTE: for debugging purposes you can add the following option:

--enable-debug

Save as filename in your "scripts" folder at your download/install location:

configure-x264.sh

NOTE: Save using "All files" and not "Text files" otherwise Windows might append the extension .txt.

Copy the file into your home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

dos2unix configure-x264.sh

=Compiling source code=

It's time to start Cygwin again...

==Additional libraries==

If any updated or additional libraries are used they need to be compiled first. Since some of these are used indirectly through FFmpeg, FFmpeg should be compiled last.

===Compiling x264 (optional)===

This section is only required for x264 compiling where you want to compile x264 yourself in order to use the latest version.

Change to the appropriate x264 folder

cd x264-trunk (example)

./configure

make

If the make proceeded without errors you will have compiled a new library file:

C:\cygwin\home\Administrator\x264-trunk\libx264.a (example)

Copy this file into the Cygwin usr/win32 folder:

C:\cygwin\usr\win32\lib (example)

Also take the following file .h file:

C:\cygwin\home\Administrator\x264-trunk\x264.h (example)

Copy this file into the usr/win32/include folder:

C:\cygwin\usr\win32\include (example)

NOTE: This will overwrite the x264.h and libx264.a from the precompiled "contrib" package!

===live555 (optional)===

This section is only required if you want to compile the latest version of live555.

Copy the live555 project package from your download/install location to the home directory:

C:\cygwin\home\Administrator

Start Cygwin and enter the following command in your shell:

tar xvf live.2006.05.17.tar.gz (example)

Replace with your version of the source package.

This will extract the contents of the file into a subfolder within your Cygwin environment with the naming convention something like:

live (example)

===Compiling FFmpeg (optional)===

This section is only required for FFmpeg compiling.

Change to the appropriate FFmpeg folder

cd ffmpeg-trunk (example)

make clean

make distclean

(This will haved remove everything except code related stuff, VLC uses a "toolbox" script
which can clean a bit more).

../configure-ffmpeg.sh

====Preparations for AMR support (optional)====

If you included the AMR reference codec sources in FFmpeg you should see that AMR-NB and WB "float support" should be working:

AMR-NB float support yes
AMR-NB fixed support no
AMR-WB float support yes
AMR-WB IF2 support no
network support no
License: GPL

AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204
V5.1.0 from http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip and extracted the source to libavcodec/amrwb_float

AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104 REL-5 V5.1.0 from
http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip and extracted the source to libavcodec/amr_float
If you try this on alpha, you may need to change Word32 to int in amr/typedef.h

NOTE: These warnings/notices can be ignored since we are using more recent versions.

====Building FFmpeg (optional)====

First clean up any leftovers from a previous compile using the following commands:

make clean

make distclean

(This will haved remove everything except code related stuff, VLC uses a "toolbox" script
which can clean a bit more).

Now build FFmpeg with the following command:

make

If the make proceeded without errors you will have compiled two new "library" files:

C:\cygwin\home\Administrator\ffmpeg-trunk\libavcodec\libavcodec.a (example)
C:\cygwin\home\Administrator\ffmpeg-trunk\libavformat\libavformat.a (example)

To copy the appropriate libs and header files to the (extracted) contrib
folder use:

make install-libs install-headers

For historical reasons the "old" method is still described here as well:

Copy the library files (with the .a extension) into the Cygwin usr/win32 folder:

C:\cygwin\usr\win32\lib (example)

NOTE: This will overwrite libavcodec.a and libavformat.a from the precompiled
"contrib" package!

For backup reasons you can first copy or rename the original files in the "contrib" package (so you won't have to reinstall the complete contrib package but can simply copy these again)

C:\cygwin\usr\win32\lib\libavcodec.a to libavcodec.a.org
C:\cygwin\usr\win32\lib\libavformat.a to libavformat.a.org

In older versions of ffmpeg the libraries had other names:

C:\cygwin\home\Administrator\ffmpeg-20050624\libavcodec\avcodec.lib (example)
C:\cygwin\home\Administrator\ffmpeg-20050624\libavformat\avformat.lib (example)

Rename those files (in Windows Explorer):

avcodec.lib to libavcodec.a
avformat.lib to libavformat.a

Then copy those library files into the Cygwin usr/win32 folder.

===Compiling live555 (optional)===

How to configure and build the code on a Linux enviroment is explained on the following live555 page:

http://www.live555.com/liveMedia/#config-unix

Some options need to be changed/added to the config.cygwin file in the live folder so open this file with a text-editor.

Add the -Wno-deprecated option:

CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 -Wno-deprecated

Save the file under its current name config.cygwin

Enter the following commands in your Cygwin shell:

cd live

The following command is for converting any DOS/Windows "line endings" to UNIX style:

dos2unix config.cygwin

make clean

./genMakefiles cygwin

make

TODO: Fix live555 compilation. It still fails with the following errors:

GroupsockHelper.cpp:477: error: aggregate `ip_mreq_source imr' has incomplete type and cannot be defined
GroupsockHelper.cpp:482: error: invalid application of `sizeof' to incomplete type `ip_mreq_source'
GroupsockHelper.cpp: In function `Boolean socketLeaveGroupSSM(UsageEnvironment&, int, netAddressBits, netAddressBits)':
GroupsockHelper.cpp:495: error: aggregate `ip_mreq_source imr' has incomplete type and cannot be defined
GroupsockHelper.cpp:500: error: invalid application of `sizeof' to incomplete type `ip_mreq_source'
make[1]: *** [GroupsockHelper.o] Error 1

==Compiling VLC==

Enter the following commands in your Cygwin shell:

cd vlc-trunk

(you can check with the pwd command to see in which folder you are and with just the cd
command without any additional parameters you can change back to your home directory).

NOTE: The following line is optional, only use that if you have problems compiling.

./toolbox --distclean

(This will have removed everything except code related stuff).

../configure-vlc.sh

make

Cross your fingers...

NOTE: ./ means you run an application/script from the "current folder" (which is vlc-trunk) and ../ points to "one directory up" (which is where configure-vlc.sh is).

==Creating self contained packages==

Once the compilation is done, you can either run VLC directly from the source tree or you can build self-contained VLC packages with the following "make" commands:

make package-win32-base

(This will create a subdirectory named vlc-x.x.x with all the binaries "stripped" without any debugging symbols).

make package-win32-zip

(Same as above but will package the directory in a zip file).

make package-win32

(Same as above but will also create an auto-installer package. You will need to have NSIS installed in its default location for this to work).

=Advanced usage=

==Updating Cygwin package versions==

If you need to update or install additional packages you can just run the Cygwin setup.exe from your download location:

C:\Downloads\cygwin\setup.exe (example)

===Using older GCC and MINGW version===

You should be aware that Cygwin automatically selects the latest versions for gcc-g++ and gcc-mingw so if you are using older versions of those (like 3.3.3-3 and the accompanied 20040810-1 packages for mingw) and wish to continue to use them you need to '''change''' those versions to '''Keep''' for '''every time you use the update process'''.

NOTE: You can click on the "View" button a few times until you see "Partial" next to it. This will give you an overview of some "Current" packages that will be updated to "New" versions.

select the View button until it reaches: Partial

Devel
3.4.4-3 gcc-core -> change version to '''Keep'''
3.4.4-3 gcc-g++ -> change version to '''Keep'''
20050522-1 gcc-mingw-core -> change version to '''Keep'''
20050522-1 gcc-mingw-g++ -> change version to '''Keep'''

Selecting the 3.4.4-3 version automatically changes the gcc-mingw-core and gcc-mingw-g++ to the 20050522-1 (or newer) versions as well.

===Downgrading Cygwin GCC packages===

If your Cygwin gcc versions are already the latest and you wish to downgrade to gcc 3.3.3-3 then it's not possible to downgrade the gcc-core/g++ and the mingw packages all at the same time, it has to be done in two steps.

select the View button until it reaches: Up To Date

Devel
3.4.4-3 gcc-core -> change version to '''3.3.3-3'''
3.4.4-3 gcc-g++ -> change version to '''3.3.3-3'''

Install, OK.

Restart the Cygwin update process.

Select the View button until it reaches: Partial

Devel
3.4.4-3 gcc-core -> change version to '''Keep'''
3.4.4-3 gcc-g++ -> change version to '''Keep'''

Select the View button until it reaches: Up To Date

Devel
20050522-1 gcc-mingw-core -> change version to '''20040810-1'''
20050522-1 gcc-mingw-g++ -> change version to '''20040810-1'''

Install, OK.

Again, for any new update process remember to change back those versions!

==GDB (Gnu Debugger)==

This section requires that you installed the gdb (Gnu Debugger) in Cygwin.

This is a typical example of creating a crashlog:

cd vlc-trunk

gdb --args vlc.exe --fast-mutex --reset-config --reset-plugins-cache

NOTE: vlc-0.9.0 uses libtool for building sources, if you want to debug from the source tree, you should type the following command instead:

libtool -mode=execute gdb --args vlc --reset-config --reset-plugins-cache

In the debugger mode run the program and make sure you reset the preferences!

(gdb) run

NOTE: the (gdb) is just a prompt which means you are in the debugger mode, please note that ''--fast-mutex'' option is no longer supported in vlc-0.9.0

It will now take a lot longer than usual for VLC to start :)

Now operate VLC as you would normally do. As soon as a crash issue occurs
you'll notice a line like this:

Program received signal SIGSEGV, Segmentation fault.
0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
---Type <return> to continue, or q <return> to quit---
459 i = i_bottom + ( i_top - i_bottom ) / 2;

Now you can do a "backtrace" by using the bt command:

(gdb) bt

And output similar to this will be created:

#0 0x0041394c in playlist_ItemGetById (p_playlist=0x19ec4f8, i_id=29)
at src/playlist/item-ext.c:459
#1 0x0b26bbf7 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29fef8}) at playlist.cpp:695
#2 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29e8b0}) at playlist.cpp:689
#3 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x29a818}) at playlist.cpp:689
#4 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0x299718}) at playlist.cpp:689
#5 0x0b26bc83 in wxvlc::Playlist::CountItems (this=0x1822e288, root=
{m_pItem = 0xffff0000}) at playlist.cpp:689
#6 0x0b26bf49 in wxvlc::Playlist::AppendItem (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:564
#7 0x0b2757fc in wxvlc::Playlist::OnPlaylistEvent (this=0x1822e288,
event=@0x1827afd0) at playlist.cpp:1438
#8 0x0b3771b8 in wxEvtHandler::ProcessEventIfMatches ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#9 0x0b376a1c in wxEventHashTable::HandleEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#10 0x0b37730d in wxEvtHandler::ProcessEvent ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#11 0x0b37711b in wxEvtHandler::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
---Type <return> to continue, or q <return> to quit---
#12 0x0b376017 in wxAppConsole::ProcessPendingEvents ()
at /usr/win32/include/wx-2.6/wx/event.h:2183
#13 0x0b3ec75a in wxIdleWakeUpModule::MsgHookProc ()
at /usr/win32/include/wx-2.6/wx/bmpbuttn.h:81
#14 0x773aca2d in USER32!GetScrollRange ()
from /cygdrive/c/WINDOWS/system32/user32.dll
#15 0x00000000 in ?? () from
(gdb)

These are the log outputs that are more usefull to developers than just mentioning "it crashes"!

NOTE: In GDB mode there are sometimes situations where GDB initially "crashes" on certain network activity (opening network shares, network traffic) which in normal operation does not occur. Just select c for continue until "normal" operation continues.

==.diff files==

Frequently patches to source code are presented or discussed in forums or in mailing lists in so called .diff format (these are "differences" to the source code).

You can apply those patches yourself to the source code or create .diff files. This requires the patchutils package in Cygwin.

===Patching source code===

Download a so called .diff file:

sse2-pixel-routines-v3.diff (example)

NOTE: make sure the file doesn't get a .txt extension, so Save as type "All Files" instead of "Text Document" (IE has a habit of renaming to .txt. If that happens just simply rename to .diff)

Copy the .diff file into the appropriate source folder

x264-trunk (example)

Apply the patch as follows

patch -p0 < sse2-pixel-routines-v3.diff (example)

NOTE: replace sse2-pixel-routines-v3.diff with your "patch"

This will output something like:

patching file common/i386/pixel.h
patching file common/i386/pixel-a.asm
patching file common/pixel.c

Your source code is now patched!

NOTE: If you want to revert to the original version you can use the -R option with the patch command or alternatively you can just delete the changed files and just do an SVN update to get the original/latest SVN version back.

===Creating .diff files===

When changing the source code it's possible to create a "difference" file against the latest source.

In this example the file /modules/codec/x264.c was changed (the part "in kbit/s" was added to a description).

Start your Cygwin shell.

Change to the appropriate folder where a changed file is.

cd vlc-trunk/modules/codec (example)

Output the svn diff command to a file:

svn diff -u > x264-patch.diff

The current folder now holds a x264-patch.diff file containing the following:

Index: x264.c
===================================================================
--- x264.c (revision 15921)
+++ x264.c (working copy)
@@ -131,7 +131,7 @@
#define RATETOL_LONGTEXT N_( "Allowed variance in average. " \
"bitrate (in kbits/s).")

-#define VBV_MAXRATE_TEXT N_("Max local bitrate")
+#define VBV_MAXRATE_TEXT N_("Max local bitrate in kbit/s")
#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.")

#define VBV_BUFSIZE_TEXT N_("VBV buffer")

NOTE: In Windows you should open this file with something else than notepad (so wordpad or some more advanced editor). This has to do with the end of line markers that are present in the file since it was made in a Linux environment.

==Reverting to older SVN source code==

If for some reason you want to revert to (use) an older version (let's say you are using revision 15916 of the VLC source code but would like to test with 15915) then use the svn "update" function from within Cygwin but use an older revision number.

Start your Cygwin shell...

cd vlc-trunk

svn up -r 15915

And you'll see something like this:

U src\input\input.c
Updated to revision 15915.

The following command will show the version used:

svn info

=FAQ/Troubleshooting=

This chapter mentions some frequently encountered problems during compile and installation procedures and possible fixes or workarounds.

=="Making all in <folder>" takes forever with 0% CPU usage==

Make seems to "stall" at a certain point (no CPU usage) and nothing seems to happen anymore:

Making all in mpeg
make[5]: Entering directory `/home/Administrator/vlc-trunk/modules/mux/mpeg'

NOTE: This problem seems to occur on dual CPU (or HyperThreading enabled)
systems.

FIX: in the vlc-trunk do a ./toolbox --distclean before doing a ../configure-vlc.sh and try again...

==configure: error: C compiler cannot create executables==

The ../configure-vlc.sh gives the following error:

checking for gcc... gcc -mno-cygwin
checking for C compiler default output file name... configure: error: C compiler
cannot create executables

FIX: it's very likely you are using the gcc 3.3 version but with the wrong mingw packages (the ones that come with 3.4). Reinstall the following gcc-mingw packages but make sure to use the older version!!!

20050522-1 gcc-mingw-core autoselected -> change to 20040810-1
20050522-1 gcc-mingw-g++ autoselected -> change to 20040810-1

You can check what version of gcc you are version in the Cygwin shell by using the following command:

gcc --version

==collect2: ld returned 1 exit status (libebml)==

A make fails with the following error:

/usr/win32/lib/libebml.a(EbmlMaster.o):EbmlMaster.cpp:(.text$_ZNSt14__simple_all
ocISsSt24__default_alloc_templateILb1ELi0EEE10deallocateEPSsj[std::__simple_allo
c<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::_
_default_alloc_template<true, 0> >::deallocate(std::basic_string<char, std::char
_traits<char>, std::allocator<char> >*, unsigned int)]+0x1d): undefined referenc
e to `std::__default_alloc_template<true, 0>::deallocate(void*, unsigned int)'
/usr/win32/lib/libebml.a(EbmlMaster.o):EbmlMaster.cpp:(.text$_ZNSt14__simple_all
ocISsSt24__default_alloc_templateILb1ELi0EEE8allocateEj[std::__simple_alloc<std:
:basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__defau
lt_alloc_template<true, 0> >::allocate(unsigned int)]+0x1d): undefined reference
to `std::__default_alloc_template<true, 0>::allocate(unsigned int)'
/usr/win32/lib/libebml.a(EbmlMaster.o):EbmlMaster.cpp:(.text$_ZNSt14__simple_all
ocIPN7libebml11EbmlElementESt24__default_alloc_templateILb1ELi0EEE8allocateEj[st
d::__simple_alloc<libebml::EbmlElement*, std::__default_alloc_template<true, 0>
>::allocate(unsigned int)]+0x1d): undefined reference to `std::__default_alloc_t
emplate<true, 0>::allocate(unsigned int)'
/usr/win32/lib/libebml.a(EbmlMaster.o):EbmlMaster.cpp:(.text$_ZNSt14__simple_all
ocIPN7libebml11EbmlElementESt24__default_alloc_templateILb1ELi0EEE10deallocateEP
S2_j[std::__simple_alloc<libebml::EbmlElement*, std::__default_alloc_template<tr
ue, 0> >::deallocate(libebml::EbmlElement**, unsigned int)]+0x1d): undefined ref
erence to `std::__default_alloc_template<true, 0>::deallocate(void*, unsigned in
t)'
collect2: ld returned 1 exit status
make[2]: *** [vlc.exe] Error 1

This problem is because libEbml is a C++ lib and it doesn't seem to link with gcc 3.4.

FIX: Use gcc 3.3 with the according 3.3 Win32 "contrib" package version or use a Win32 "contrib" package for 3.4 (or even better try compiling it yourself).

WORKAROUND for gcc 3.4: Use --disable-mkv in configure-vlc.

==zip: command not found==

A make package fails with the following error:

zip -r vlc-0.8.4-svn-win32.zip vlc-0.8.4-svn
/bin/bash: line 1: zip: command not found
make: *** [package-win32-base-zip] Error 127

FIX: Doh! forgot to install the zip package in Cygwin :P

==vlc.exe: Permission denied==

A make finished successfully and produced vlc.exe, but running the executable returns the following:

bash: ./vlc.exe: Permission denied

The permissions on both vlc.exe & vlc.exe.manifest must be set to executable.

FIX: Type the following:

chmod 755 vlc.exe vlc.exe.manifest

==error: parse error before '(' token==

A make (compile) of FFmpeg results in the following error:

/usr/include/sys/unistd.h:203: error: parse error before '(' token
make[1]: *** [ffm.o] Error 1

It's very likely you are usix the POSIX emulater which you shouldn't...

FIX: compile with the option

-mno-cygwin

==error: invalid conversion from `const void*' to `void*'==

src/theme_loader.cpp: In function `int gzwrite_frontend(int, const void*, size_t)':
src/theme_loader.cpp:599: error: invalid conversion from `const void*' to `void*'
src/theme_loader.cpp:599: error: initializing argument 2 of `int gzwrite(void*,
void*, unsigned int)'
make[6]: *** [libskins2_plugin_a-theme_loader.o] Error 1

FIX: This is related to a problem with the zlib library, updating to at least 1.2.2-1 but preferably 1.2.3 or newer is required

==error: cannot convert `const wxChar*' to `const char*==

if g++ -mno-cygwin -DHAVE_CONFIG_H -I. -I. -I../../.. -I/usr/win32/include -I/
usr/win32/include/ebml -D_OFF_T_ -D_off_t=long -DSYS_MINGW32 -I../../../include
`top_builddir="../../.." ../../../vlc-config --cxxflags plugin wxwidgets` -Wsign
-compare -Wsign-compare -Wall -mms-bitfields -pipe -MT libwxwidgets_plugin_a-wx
widgets.o -MD -MP -MF ".deps/libwxwidgets_plugin_a-wxwidgets.Tpo" -c -o libwxwid
gets_plugin_a-wxwidgets.o `test -f 'wxwidgets.cpp' || echo './'`wxwidgets.cpp; \
then mv -f ".deps/libwxwidgets_plugin_a-wxwidgets.Tpo" ".deps/libwxwidgets_plugi
n_a-wxwidgets.Po"; else rm -f ".deps/libwxwidgets_plugin_a-wxwidgets.Tpo"; exit
1; fi
In file included from /usr/win32/include/wx-2.6/wx/debug.h:22,
from /usr/win32/include/wx-2.6/wx/defs.h:452,
from /usr/win32/include/wx-2.6/wx/wxprec.h:13,
from wxwidgets.h:40,
from wxwidgets.cpp:39:
/usr/win32/include/wx-2.6/wx/wxchar.h: In function `size_t wxStrlen(const wxChar
*)':
/usr/win32/include/wx-2.6/wx/wxchar.h:759: error: cannot convert `const wxChar*'
to `const char*' for argument `1' to `size_t strlen(const char*)'
In file included from /usr/win32/include/wx-2.6/wx/memory.h:20,
from /usr/win32/include/wx-2.6/wx/object.h:25,
from /usr/win32/include/wx-2.6/wx/wx.h:16,
from wxwidgets.h:41,
from wxwidgets.cpp:39:
/usr/win32/include/wx-2.6/wx/string.h: In constructor `wxString::wxString(const
wxChar*)':

FIX: update wxwidgets or try a different or newer Win32 "contrib" package.

==undefined reference to `_av_parser_change' (FFmpeg)==

ffmpeg.o: In function `output_packet':
/home/Administrator/FFmpeg-20050724/ffmpeg.c:1414: undefined reference to `_av_parser_change'
/home/Administrator/FFmpeg-20050724/ffmpeg.c:1415: undefined reference to `_av_destruct_packet'
collect2: ld returned 1 exit status
make: *** [ffmpeg_g.exe] Error 1

This is a possible conflict when you use normal configure-ffmpeg (uses /usr/win32
contrib) instead of configure-ffmpeg-svn

==undefined reference to `_pp_get_context' (FFmpeg)==

./modules/codec/ffmpeg/libffmpeg.a(libffmpeg_a-postprocess.o): In function `Init
Postproc__ffmpeg':
/home/Administrator/vlc-trunk/modules/codec/ffmpeg/postprocess.c:164: undefined
reference to `_pp_get_context'
./modules/codec/ffmpeg/libffmpeg.a(libffmpeg_a-postprocess.o): In function `PPQC
allback':
/home/Administrator/vlc-trunk/modules/codec/ffmpeg/postprocess.c:244: undefined
reference to `_pp_get_mode_by_name_and_quality'
./modules/codec/ffmpeg/libffmpeg.a(libffmpeg_a-postprocess.o): In function `Post
procPict__ffmpeg':
/home/Administrator/vlc-trunk/modules/codec/ffmpeg/postprocess.c:191: undefined
reference to `_pp_postprocess'
$
ePostproc__ffmpeg':
/home/Administrator/vlc-trunk/modules/codec/ffmpeg/postprocess.c:209: undefined
reference to `_pp_free_mode'
/home/Administrator/vlc-trunk/modules/codec/ffmpeg/postprocess.c:210: undefined
reference to `_pp_free_context'
collect2: ld returned 1 exit status
make[2]: *** [vlc.exe] Error 1
make[2]: Leaving directory `/home/Administrator/vlc-trunk'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/Administrator/vlc-trunk'
make: *** [all] Error 2

FFmpeg was not compiled with post processing support. To do so the following options need to be added to the configure lines for FFmpeg:

--enable-pp --enable-gpl

Postprocessing code is under GPL.

==error: expected primary-expression before '<<' token==

In file included from /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32
api/windows.h:52,
from ../../../include/vlc_common.h:459,
from ../../../include/vlc/vlc.h:153,
from dshow.cpp:31:
/usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32api/wingdi.h:3:1: warn
ing: this is the location of the previous definition
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:14: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:35,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/ddraw.h:5552: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:45,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/strmif.h:2: warning: ignoring #pragma warning
In file included from /usr/win32/include/dsound.h:13,
from /usr/win32/include/amaudio.h:18,
from /usr/win32/include/dshow.h:47,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/d3dtypes.h:22: warning: ignoring #pragma warning
/usr/win32/include/d3dtypes.h:1813: warning: ignoring #pragma warning
In file included from /usr/win32/include/dshow.h:48,
from common.h:45,
from dshow.cpp:35:
/usr/win32/include/control.h:2: warning: ignoring #pragma warning
dshow.cpp: In function `int CommonOpen(vlc_object_t*, access_sys_t*, vlc_bool_t)
':
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<<' token
dshow.cpp:456: error: expected primary-expression before '<' token
dshow.cpp:456: error: expected primary-expression before '.' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '==' token
dshow.cpp:470: error: expected primary-expression before '=' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>>' token
dshow.cpp:484: error: expected primary-expression before '>' token
dshow.cpp:484: error: expected primary-expression before '.' token
dshow.cpp:485: error: expected `;' before "IAMCrossbar"
dshow.cpp:491: error: `pXbar' undeclared (first use this function)
dshow.cpp:491: error: (Each undeclared identifier is reported only once for each
function it appears in.)
make[6]: *** [libdshow_plugin_a-dshow.o] Error 1
make[6]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[5]: *** [all-modules] Error 1
make[5]: Leaving directory `/home/Administrator/vlc-trunk/modules/access/dshow'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/Administrator/vlc-trunk/modules/access'
make[3]: *** [all] Error 2

Basically in case of conflict svn adds "<<< mine" and "=======" and ">>>> r1242" which makes gcc complain.

FIX: revert the offending file

==configure: error: Could not find ffmpeg on your system==

configure: error: Could not find ffmpeg on your system: you may get it from
http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use
--disable-ffmpeg to disable the ffmpeg plugins.
make: *** [config.status] Error 1

This can happen when you do a make without doing a configure and the configure.ac file in the source code recently updated.

FIX: do a full configure (using ../configure-vlc.sh) and then run the make process

==Objective C source seen but `OBJC' is undefined==

The configure process stops halfway.

+ aclocal-1.9 -I m4
+ autoconf
+ autoheader
+ automake-1.9 --add-missing --copy -Wall
configure.ac: installing `autotools/install-sh'
configure.ac: installing `autotools/missing'
activex/Makefile.am:143: shell $(VLC_CONFIG: non-POSIX variable name
activex/Makefile.am:143: (probably a GNU make extension)
activex/Makefile.am: installing `autotools/compile'
activex/Makefile.am: installing `autotools/depcomp'
modules/gui/macosx/Makefile.am: Objective C source seen but `OBJC' is undefined
modules/misc/testsuite/Makefile.am: Objective C source seen but `OBJC' is undefi
ned
src/Makefile.am: Objective C source seen but `OBJC' is undefined
Makefile.am:282: user target `vlc$(EXEEXT)' defined here...
/usr/share/automake-1.9/am/program.am: ... overrides Automake target `vlc$(EXEEX
T)' defined here
Makefile.am:230: while processing program `vlc'
make: *** No targets specified and no makefile found. Stop.

This problem is related to a warning earlier on and only occured in a few revisions where a built-in workaround wasn't working properly:

+ echo 'Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.'
Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP.

FIX: update autoconf to 2.60 or newer. If Cygwin doesn't provide this version yet then build it yourself from extras/contrib.

Enter the following commands in your Cygwin shell:

cd vlc-trunk/extras/contrib

./bootstrap

cd src

make .autoconf

There should now be compiled autoconf version (probably 2.60 or newer) in extras/contrib that the bootstrap process will use.

Now start the whole "Compile VLC" process from the start again.

==Error: cannot create temporary file for diversion: Permission denied==

If the above error appears, it might mean you don't have the TMPDIR defined in cygwin. You will need to define it and have its value point to your temporary directory.

=Version=

20050627 Initial version

20050628 Updated some more exceptions

20050628 Some info added about FFmpeg compiling with AMR

20050629 Finalized FFmpeg compiling

20050630 Cross-compiling

20050724 Some extra compile explanations

20050726 Removed cross-compiling (was for linux -> win32) Patching source code with .diff files

20050823 Added zlib error

20050923 --enable-sdl --with-sdl-config-path=/usr/win32/bin added to configure. Added debug section

20051102 Changed FFmpeg lib names

20051128 Detailed Cygwin upgrade/downgrade for gcc 3.3. Renamed some update scripts. Added FFmpeg CVS update. --disable-gnomevfs added to configure (only used on linux)

20060121 PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig added to configure

20060128 Added curl and libtool to Cygwin for those that want to be able to build extras/contrib themselves

20060217 Added make install-libs install-headers to FFmpeg compile

20060222 Remark about missing "gettext" libs for Cygwin during install

20060225 ./bootstrap: you need libtool

20060618 Updated GCC to 3.4 version and added FFmpeg SVN and DTS support

20060805 Added note about using older binutils and gdb for Cygwin!

20060915 Added note about updating autoconf from extras/contrib for an OBJC problem during configure

20061108 Added note this document is no longer usable since Cygwin has been unusable probably related to some bash/dos2unix change

20070612 Added note about --enable-dca

[[Category:Building]]
[[Category:Coding]]

Win32CompileMSYSOld

2007-11-08T22:17:23Z

Trax:

MSYS/MinGW environment for Windows from http://developers.videolan.org/vlc/msys-compile.txt

TODO: GPAC, NSIS, PKG-Config, more than just setting up the environment...

THIS ARTICLE IS UNDER CONSTRUCTION!!!

=Introduction=

=MSYS/MinGW environment=

Setting up a working MSYS/MinGW environment requires the following:

* MSYS installation
* Updating MSYS
* MSYS DTK (Developer Tool Kit)
* Updating bash (shell)
* MinGW installation
* Configuration of fstab
* Creation of home folder

Note that the following generic resource locations were used to download the appropriate packages (and more recent versions might be obtained from here):

[http://prdownloads.sourceforge.net/mingw MSYS/MinGW related]

[http://prdownloads.sourceforge.net/nasm nasm]

[http://www.libsdl.org SDL]

[http://www.info-zip.org zip]

[http://pkgconfig.freedesktop.org/releases pkg-config]

[ftp://ftp.gnu.org/pub/gnu/sed sed]

==Minimal SYStem (MSYS) installation==

http://prdownloads.sourceforge.net/mingw/MSYS-1.0.11-2004.04.30-1.exe

Perform a basic installation into C:\msys

Do not continue with the post install (this will be done later).

==Update MSYS==

Update MSYS to a more recent version

http://prdownloads.sourceforge.net/mingw/MSYS-1.0.11-20060807.tar.bz2

Extract the .tar.bz2 file, it contains the following files:

mount.exe
msys-1.0.dll
ps.exe

Copy the files to:

C:\msys\bin

This will overwrite/update the version(s) used in MSYS.

==MSYS DTK (Developer Tool Kit)==

http://prdownloads.sourceforge.net/mingw/msysDTK-1.0.1.exe

Perform a basic installation into C:\msys

==Updating BASH==

http://prdownloads.sourceforge.net/mingw/bash-3.1-MSYS-1.0.11-snapshot.tar.bz2

Extract the .tar.bz2 file, in the bin subfolder it contains the following files:

bash.exe
sh.exe

Copy the files to:

C:\msys\bin

This will overwrite/update the sh.exe version used in MSYS

==MinGW==

http://prdownloads.sourceforge.net/mingw/MinGW-5.0.3.exe

Select the download option.

Do not install with "Current" MinGW packages but select "Candidate".

Select the following components to install:

MinGW base tools (autoselected)
g++ compiler

Then installation will finish downloading automatically.

Run MinGW-5.0.3.exe again and select the download and install option to restart the installation.

Selet "Candidate" still and select the same components to install.

Perform the installation into the default destination:

C:\msys\mingw

The following versions (or possibly newer) of the candidate packages will be
downloaded and installed:

mingw-runtime-3.10.tar.gz
w32api-3.7.tar.gz
binutils-2.16.91-20060119-1.tar.gz
gcc-core-3.4.5-20060117-1.tar.gz
gcc-g++-3.4.5-20060117-1.tar.gz

(It is also possible to get these packages seperately and extract them to C:\msys\mingw)

==Configuring fstab==

The folder C:\msys\etc contains the following file:

fstab.sample

Copy the file to:

fstab

Open the file with a text editor and change the path value for the mingw mount point from:

c:/mingw to c:/msys/mingw

Save the file.

==Starting MSYS==

The first time MSYS is started, a "home" folder is created, for example:

C:\msys\home\Administrator

=Installing additional packages=

The following packages are required for building VLC

* Wget
* Iconv
* Gettext
* MinGW utils
* Libtool
* Autoconf
* Automake
* Zip
* Coreutils

==WGet==

Wget is required for building from the "extras/contrib" or mingwPORT packages.

http://prdownloads.sourceforge.net/mingw/wget-1.9.1-mingwPORT.tar.bz2

Although this is a mingwPORT package it already has a precompiled wget on board.

Extract the .tar.bz2 file. It contains the following file in the bin subfolder:

wget.exe

Copy the file to:

C:\msys\mingw\bin

==Iconv (GNU libiconv)==

http://prdownloads.sourceforge.net/mingw/libiconv-1.8.0-2003.02.01-1.exe

Perform a basic installation into the default destination Folder

C:\msys\mingw

===Updating Iconv===

http://prdownloads.sourceforge.net/mingw/libiconv-1.10-mingwPORT.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\Administrator (example)

Start the MSYS shell and do the following commands:

cd libiconv-1.10-mingwPORT/libiconv-1.10/mingwPORT

mkdir -p /usr/src/libiconv-1.10

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into c:/msys/mingw/lib.

NOTE: For some unknown reason usage of Iconv fails when 1.10 is installed directly without having installed 1.8.0.

==Gettext==

This approach breaks libiconv.. under investigation..

http://downloads.sourceforge.net/mingw/gettext-0.16.1-1-bin.tar.bz2

Untar this packet and copy the files in the subdirectories under gettext-0.16.1-1-bin/usr/local to the corresponding subdirectories under C:\msys\mingw.
For example:
copy gettext-0.16.1-1-bin/usr/local/lib/*.* to C:\msys\mingw\lib\
......................................................
Note:
The latest VLC from svn requires gettext-0.16.xx to build.

==MinGW Utils==

The unix2dos tool from this package is required during the "make package" process of VLC for some conversion of txt files.

http://prdownloads.sourceforge.net/mingw/mingw-utils-0.3.tar.gz

Extract the .tar.gz file. it contains the following file in the bin subfolder:

unix2dos.exe

Copy the file to:

C:\msys\mingw\bin

==Libtool==

http://prdownloads.sourceforge.net/mingw/libtool-1.5.22-mingwPORT.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\Administrator (example)

Start the MSYS shell and do the following commands:

cd libtool-1.5.22-mingwPORT/libtool-1.5.22/mingwPORT

mkdir -p /usr/src/libtool-1.5.22

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into c:/msys/mingw/lib.

==Autoconf==

http://prdownloads.sourceforge.net/mingw/autoconf-2.59-mingwPORT.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\Administrator (example)

Start the MSYS shell and do the following commands:

cd autoconf-2.59-mingwPORT/autoconf-2.59/mingwPORT

mkdir -p /usr/src/autoconf-2.59

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into c:/msys/mingw/lib.

==Updating autoconf from contrib==

VLC 0.8.6 and later (including 0.9.0 svn/development) require an autoconf version
of 2.60 or greater.

If during the configure process the following msg appears it's time to update:

"Hey, your autoconf is quite old. Update it".

Open your MSYS shell:

cd vlc-trunk/extras/contrib

./bootstrap

cd src

make .autoconf

==Automake==

http://prdownloads.sourceforge.net/mingw/automake-1.9.5-mingwPORT.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\Administrator (example)

Start the MSYS shell and do the following commands:

cd automake-1.9.5-mingwPORT/automake-1.9.5/mingwPORT

mkdir -p /usr/src/automake-1.9.5

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into c:/msys/mingw/lib.

==Zip==

Zip is required for making .zip packages...

http://www.info-zip.org/

ftp://ftp.info-zip.org/pub/infozip/WIN32/zip232xN.zip

Extract the .zip. It contains the following file in the bin subfolder:

zip.exe

Copy the file to:

C:\msys\bin

==Coreutils==

The whoami tool from this package is required for "svn builds".

http://prdownloads.sourceforge.net/mingw/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2

Extract the .tar.bz2 file. it contains the following file in the bin subfolder:

whoami.exe

Copy the file to:

C:\msys\mingw\bin

=Optional packages=

==GDB (optional)==

GDB is used for debugging purposes.

http://prdownloads.sourceforge.net/mingw/gdb-6.3-2.exe

Perform an installation into the folder

C:\msys\mingw

==ZLib (optional)==

Zlib is a required package in combination with the Gpac package for .avs and
.mp4 output support when building the x264 library.

http://prdownloads.sourceforge.net/mingw/zlib-1.2.3-mingwPORT-1.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\Administrator (example)

Start the MSYS shell and do the following commands:

cd zlib-1.2.3-mingwPORT/zlib-1.2.3/mingwPORT

mkdir -p /usr/src/zlib-1.2.3

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into c:/msys/mingw.

==Updating SDL from mingwPORT (optional)==

SDL support is required when building ffplay from the FFmpeg package.

http://prdownloads.sourceforge.net/mingw/SDL-1.2.8-mingwPORT.tar.bz2

Extract the .tar.bz2 file. Copy the contents into your home folder in MSYS

C:\msys\home\SDL-1.2.8-mingwPORT (example)

Start the MSYS shell and do the following commands:

cd SDL-1.2.8-minwPORT/SDL-1.2.8/mingwPORT

mkdir -p /usr/src/SDL-1.2.8

./mingwPORT.sh

Follow the default installation.

If all went well all the appropriate libraries should be installed/built and placed into /usr/local/lib.

===Updating SDL (optional)===

http://www.libsdl.org/release/SDL-1.2.11.tar.gz

Extract the .tar.gz file. Copy the contents into your home folder in MSYS

C:\msys\home\SDL-1.2.11 (example)

Start the MSYS shell and do the following commands:

cd SDL-1.2.11

./configure

make

make install

If all went well all the appropriate libraries should be installed/built and placed into /usr/local/lib.

==Nasm (optional)==

The Netwide assembler (nasm) is required for building the x264 library.

http://sourceforge.net/project/showfiles.php?group_id=6208

Download the latest win32 binaries:

http://prdownloads.sourceforge.net/nasm/nasm-0.98.39-win32.zip?download

Extract the .zip. It contains the following file in the bin subfolder:

nasmw.exe

Rename the file to nasm.exe and copy it to the following location:

C:\msys\mingw\bin

==GPAC (optional)==

GPAC is required for building the x264 library with mp4 output support.

Start the MSYS shell and do the following commands:

cvs -z3 -d:pserver:anonymous@gpac.cvs.sourceforge.net:/cvsroot/gpac co -P gpac

This will download the latest GPAC version from CVS.

cd gpac

./configure

make install-lib

TODO: copy GPAC files to appropriate folder automagically.

==x264 (optional)==

Start the MSYS shell and do the following commands:

svn co svn://svn.videolan.org/x264/trunk x264-trunk

cd x264-trunk

For generic purposes:

./configure

make

For VLC:

./configure --prefix=/usr/win32

make

make install

This will copy the appropriate libs and .h to the prefix folder which will also be used by VLC for building the contrib

For compiling "stand-alone with mp4 output support" (this requires GPAC):

./configure --enable-mp4-output

make

If you wish to compile FFmpeg stand-alone with x264 support then also do this

make install

This will copy the appropriate libs and .h files to the default /usr/lib and /usr/include

==FFmpeg (optional)==

Start the MSYS shell and do the following commands:

svn co svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-trunk

cd ffmpeg-trunk

For generic purposes:

./configure --enable-mingw32 --enable-memalign-hack \
--enable-gpl --enable-pp

make

For compiling with x264 support:

(This assumes you did a "make install" for x264 which will have copied the appropriate lib and .h files into lib/include).

./configure --enable-mingw32 --enable-memalign-hack \
--extra-cflags=-I/usr/local/include \
--extra-ldflags=-L/usr/local/lib \
--enable-gpl --enable-pp --enable-x264

make

For compiling into VLC:

(This does not need x264 lib in FFmpeg since VLC uses that directly, also prefix and extra flags are used to point to the "contrib" folder):

./configure --enable-mingw32 --enable-memalign-hack \
--extra-cflags=-I/usr/win32/include \
--extra-ldflags=-L/usr/win32/lib \
--prefix=/usr/win32 \
--enable-faac --enable-mp3lame --enable-gpl --enable-pp

make

make install-libs install-headers

This will copy all the appropriate libs and .h files into usr/win32/include and lib so they can be used by VLC compilation.

=FAQ=

Various troubleshooting issues..

==Make .qt4 from extras/contrib==

Fails on:

checking for libmpeg2.a in /home/Administrator/vlc-trunk/./extras/contrib/src/mpeg2dec... no
configure: error: cannot cd to /home/Administrator/vlc-trunk/./extras/contrib/src/mpeg2dec

Workaround: configure with

--without-contrib

==Make package-win32-zip==

Fails on:

sed -i 's%share/osdmenu%osdmenu%g' ./vlc-0.9.0-svn/osdmenu/*.cfg
sed: invalid option -- i

Workaround: compile sed 4.09 (any newer versions fail to compile on missing alloca)

ftp://ftp.gnu.org/pub/gnu/sed/sed-4.0.9.tar.gz

use the newer sed version in c:\msys\mingw\bin and rename the old one to sed3.exe or something

ONLY use the 4.09 sed to do a make package-win32-zip, it will fail to compile VLC source
(so after it finishes, you have to copy the old version back again).

So in conclusion:

make package-win32-zip fails with sed 3.02 on -i
make autoconf fails with sed 4.09 on -E
sed 4.10+ requires glib
glib requires pkgconfig but pkgconfig requires glib?!

==Warnings during configure==

Using contrib from 20061015 still a lot of warnings during configure:

checking dynamic linker characteristics... ./configure: line 14697: f77: command not found
./configure: line 14825: f77: command not found

configure: WARNING: libshout library not found
configure: WARNING: MusicBrainz library not found
configure: WARNING: CD Reading and information library not found
configure: WARNING: VCD information library not found
configure: WARNING: new enough libcddb not found. CDDB access disabled

checking for mpcdec/mpcdec.h... yes
configure: WARNING: only static linking is available, you must provide a gme-tree

./configure: line 54814: --exists: command not found

configure: WARNING: Probe disc disabled because ok libcdio library not found
configure: WARNING: VCD information on Probe disc disabled because ok
libvcdinfo not found
configure: WARNING: QT4 library not found
configure: WARNING: DAAP library not found
configure: WARNING: avahi-client library not found

==Can not write to output file with unix2dos==

unix2dos: converting file ./vlc-0.9.0-svn/AUTHORS.txt to DOS format ...
unix2dos: can not write to output file
unix2dos: problems converting file ./vlc-0.9.0-svn/AUTHORS.txt
unix2dos: converting file ./vlc-0.9.0-svn/MAINTAINERS.txt to DOS format ...
unix2dos: converting file ./vlc-0.9.0-svn/THANKS.txt to DOS format ...
unix2dos: can not write to output file

=Version=

20060926 Initial version

20060928 Reworked layout

20061011 Added troubleshooting section

20061119 Added FFmpeg and x264. Removed unicode warning from troubleshooting

20070113 WIKI version

[[Category:Building]]
[[Category:Coding]]

TraxPage

2007-10-24T20:53:18Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
10, 12, 13, 14, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4 (in trac): play file, open playlist, '''CRASH'''
*** http://trac.videolan.org/vlc/ticket/1344
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX (fixed): play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.
* WONTFIX

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4 (duplicate of issue 1): shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]
* not might, is [[User:Funman|funman]]

9 QT4 (wontfix): extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]
* no, there are not in the same category, that is it. [[User:J-b|jb]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4 (merged to trac): assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4 (fixed): assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4 (not reproducable): play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?
* no longer an issue since svn 22584 or nightly 20070813 [[User:Trax|Trax]]

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4 (fixed): S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]
* confirmed to work in 22822 win32 [[User:Trax|Trax]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4 (not reproducable 20070813): shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]
* seems no longer an issue with svn 22584 or nightly 20070813 [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: (partially fixed) extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4 (fixed): [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4 (fixed): menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4 (fixed): extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

48 QT4 (fixed): cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:
* Partially fixed, disk is selectable but browse doesn't work 20071018 nightly [[User:Trax|Trax]]

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-10-17T22:02:30Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4 (merged to trac): assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4 (fixed): assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4 (not reproducable): play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?
* no longer an issue since svn 22584 or nightly 20070813 [[User:Trax|Trax]]

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4 (not reproducable 20070813): shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]
* seems no longer an issue with svn 22584 or nightly 20070813 [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: (partially fixed) extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4 (fixed): [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4 (fixed): menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4 (fixed): extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

48 QT4 (fixed): cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:
* Partially fixed, disk is selectable but browse doesn't work 20071018 nightly [[User:Trax|Trax]]

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-10-13T18:07:45Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4 (merged to trac): assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4 (fixed): assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4 (not reproducable): play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?
* no longer an issue since svn 22584 or nightly 20070813 [[User:Trax|Trax]]

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4 (not reproducable 20070813): shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]
* seems no longer an issue with svn 22584 or nightly 20070813 [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: (partially fixed) extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4 (fixed): [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4 (fixed): menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4 (fixed): extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-10-13T12:22:36Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4 (merged to trac): assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4 (not reproducable 20070813): shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]
* seems no longer an issue with svn 22584 or nightly 20070813 [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: (partially fixed) extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4 (fixed): [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4 (fixed): menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4 (fixed): extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-10-13T12:11:07Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4 (merged to trac): assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4: shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-09-11T12:07:32Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4 (fixed): play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4: assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4 (fixed): would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4 (unknown): rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)
* Not reproducable in 21952, might be related to other problem [[User:Trax|Trax]]

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4 (fixed): file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

* This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]
* Yes that was my problem [[User:Trax|Trax]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4: shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-09-11T12:01:37Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
1 , 4? , 8, 9, 10, 12, 13, 14, 21, 23?, 25?, 28, 30, 31, 32, 34, 35, 36, 37, 38, 40, 41, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4: play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track
* should be fixed on win32 [[User:Funman|funman]]
* threading issue on linux, so can't test now [[User:Funman|funman]]

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4: assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191
* fixed, not using PLAYLIST_GO anymore, so the added directory won't start playing [[User:Funman|funman]]

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4: would be nice to have the speaker icon have a mute version with a cross in it
* fixed [[User:Funman|funman]]

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)
* F is done [[User:Funman|funman]]

25 QT4: rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)
* Partly done. Not optimal but this would be enough though [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4: file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

This has been changed after my XDG Base Directory Specification commit. (It should at least default to a "normal" user directory, not app data). Not sure if that was the issue you were mentioning though. [[User:Dionoea|Dionoea]]

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX
* linux ok [[User:Funman|funman]]

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4: shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)
* i don't agree, but we could have a setting to have it always enabled (i.e. not by default) [[User:Funman|funman]]

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''
* fixed (marq still remains anyway :/) [[User:Funman|funman]]

40 QT4: extended settings, add logo, '''CRASH'''
* qt4 threads related [[User:Funman|funman]]

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option
* done in rev 21879 [[User:J-b|jb]] 19:25, 8 September 2007 (CEST)

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?
* done in rev 21890 [[User:J-b|jb]] 03:30, 9 September 2007 (CEST)

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)
* That code would also work if the items weren't grayed out (we'd just need to use something else than a QGroupBox for the container since that automatically disables the child widgets when it's unchecked ... so basically we'd need our own QGroupBox class without the "disable all the child widgets" bit, or move the enable/disable checkbox out of the GroupBox's title (which wouldn't look good)). The motivation behind greying those items out was that most filters allow updating of their parameters real time so it doesn't really matter. (And filters which don't allow updating of their parameters should be restarted automatically, not sure if that's done though, I'd have to check.) If wanted/needed, we can keep all the input boxes enabled, even when the filter is disabled (or make it an option :D). [[User:Dionoea|Dionoea]]

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)
* Easiest solution would be to sort the language arrays (make sure that the two stay in sync!!!) in src/libvlc-module.c (that's a sort in the source code before compilation). We can't automate the sort since it'd then sort all other multiple choice config options in the interface which we're not sure that we want to do. [[User:Dionoea|Dionoea]]

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-09-08T16:49:02Z

Trax:

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
3 , 4? , 6?, 8, 9, 10, 12, 13, 14, 16, 19, 21, 23?, 25?, 26, 28, 30, 31, 32, 34, 35, 36, 37, 38, 39, 40, 41, 43, 44, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4: play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4: assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4: would be nice to have the speaker icon have a mute version with a cross in it

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)

25 QT4: rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4: file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

36 QT4: shoutcast TV discovery, click on the 1st discovered item, '''CRASH''' on playlist_nodedump
* duplicate issue? [[User:Trax|Trax]]

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, '''CRASH'''

40 QT4: extended settings, add logo, '''CRASH'''

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-09-08T16:48:45Z

Trax: /* svn 21737 */

TraxPage

2007-09-08T16:46:04Z

Trax: /* nightly win32-20070831 */

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
3 , 4? , 6?, 8, 9, 10, 12, 13, 14, 16, 19, 21, 23?, 25?, 26, 28, 30, 31, 32, 34, 35, 36, 37, 38, 39, 40, 41, 43, 44, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4: play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4: assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4: would be nice to have the speaker icon have a mute version with a cross in it

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)

25 QT4: rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4: file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

CRASH 36 QT4: shoutcast TV discovery, click on the 1st discovered item, crash on playlist_nodedump

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

CRASH 39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, crash

CRASH 40 QT4: extended settings, add logo, crash

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)

TraxPage

2007-09-08T16:44:50Z

Trax: /* svn 21817 */

NOTE: I mostly focussed on QT4 so if there's an issue it doesn't necessarily mean it
isn't a problem in WX either..

== Remaining issues ==
3 , 4? , 6?, 8, 9, 10, 12, 13, 14, 16, 19, 21, 23?, 25?, 26, 28, 30, 31, 32, 34, 35, 36, 37, 38, 39, 40, 41, 43, 44, 45

== nightly win32-20070831 ==

1 WX/QT4: play file, open playlist, '''CRASH'''
* rumoured to be fixed in svn already [[User:Trax|Trax]]
* nope wrong.. [[User:Trax|Trax]]

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe -I wx

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2776.0x8a8]
0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
(gdb) bt
#0 0x77c478c0 in strlen () from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#1 0x691c2103 in TextPrint (p_msg=0x3e8320, p_file=0x77c5fce0)
at logger.c:393
#2 0x691c1f28 in FlushQueue (p_sub=0xbcaa40, p_file=0x77c5fce0, i_mode=0)
at logger.c:377
#3 0x691c1e49 in Run (p_intf=0xa51348) at logger.c:337
#4 0x70317339 in RunInterface ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#5 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#6 0x00a51348 in ?? ()
#7 0x00000000 in ?? () from

As for QT4, normal discovery is fine but if you first open file, then shoutcast TV
discovery and click on item

Starting program: /home/User/daily/vlc-0.9.0-svn-21875-debug/vlc.exe

Program received signal SIGSEGV, Segmentation fault.
[Switching to thread 2084.0x1e8]
---Type <return> to continue, or q <return> to quit---
0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
(gdb) bt
#0 0x70321655 in __vlc_mutex_lock ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#1 0x7032139f in input_item_subitem_added ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#2 0x7038b075 in vlc_event_send ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#3 0x70244a01 in input_ItemAddSubItem (p_parent=0x4c23640, p_child=0x7d077e0)
at ../../../include/vlc_input.h:160
#4 0x702446a7 in Demux (p_demux=0x4c1cc68) at pls.c:164
#5 0x70334c48 in MainLoop ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#6 0x7033474a in Run ()
from /home/User/daily/vlc-0.9.0-svn-21875-debug/libvlc.dll
#7 0x77c3a3b0 in msvcrt!_endthreadex ()
from /cygdrive/c/WINDOWS/system32/msvcrt.dll
#8 0x04bd89e8 in ?? ()
#9 0x04b7b0e0 in ?? ()
#10 0x003e0000 in ?? ()
#11 0x04cbe700 in ?? ()
#12 0x00000000 in ?? () from

2 QT4 (fixed): mkv crash (regression, works in WX)
* Sample ? [[User:J-b|jb]] 12:14, 8 September 2007 (CEST)
* Must have been fixed meanwhile. Works perfectly [[User:J-b|jb]] 16:57, 8 September 2007 (CEST)

3 QT4: play file, deinterlace, enable, resizes video to 10x10 pixels! deinterlace disable same effect workaround: disable/enable video track

4 QT4/WX: play button, doesn't give open dialog anymore
* Works fine, but we need a way to know which one of "media library"/"playlist"/"services discovery" is active, and also a way to get the number of items in one of these "playlists" [[User:Funman|funman]] 01:22, 8 September 2007 (CEST)
* needs --no-media-library as workaround [[User:Trax|Trax]]

5 QT4: open file, doesn't go where you click. when there is 2 rows and you click on a 2nd row it will shift the whole view to the left. so if you doubleclick (which used to select and open) you end up selecting the wrong file
* Qt4.2 bug under windows.

6 QT4/WX (fixed): no longer avi corrupt warning popup
* Ok in 21875 [[User:Trax|Trax]]

7 QT4 (fixed): slider doesn't go where you click anymore, regression (does work in WX)
* fixed by ssbssa [[User:Funman|funman]]

8 QT4: shoutcast TV, changing channels often segfaults
* might be related to issue 1 [[User:Trax|Trax]]

9 QT4: extended prefs, various modules not found (erase, marq, logo etc.)
* ok on linux [[User:Funman|funman]]
* this is when changing settings [[User:Trax|Trax]]

10 QT4: wrong win32 slash, / instead of \ in filename

11 QT4: shows popup filename in taskbar while wx doesn't
* just means wx sucks [[User:Funman|funman]]

12 QT4: shows full filename in titlebar instead of just the filename, video only
* ok on linux [[User:Funman|funman]]

13 QT4: shows full filename on vout osd instead of just the filename
* ok on linux [[User:Funman|funman]]

14 QT4: assertion '''CRASH''' in playlist_model.cpp: add sap or podcast, select, remove also will not remove audio or TV

15 QT4 (fixed): open network:
** https will not appear in customize
** rtsp cannot enter address
** udp/rtp (unicast) can enter address but doesn't appear in customize
* Done and fixed [[User:J-b|jb]] 12:27, 8 September 2007 (CEST)

16 QT4: assertion '''CRASH''' on open directory: playlist/tree.c line 191

17 QT4 (implemented): Filter "video files" doesnt include .gxf and .mxf

18 QT4: dock playlist, doesn't seem to work properly when showing videos, too small undock and replay a clip and '''CRASH''' (because the size is small?)
* Won't fix until QDockWidget

19 QT4: would be nice to have the speaker icon have a mute version with a cross in it

20 QT4 (fixed): the numerical value for slower/faster isn't updated
* Done [[User:J-b|jb]] 15:48, 8 September 2007 (CEST)

21 QT4: play file, open playlist, doubleclick the file you are playing, '''CRASH''' as sertion failed: playlist_model.cpp line 495, expression index.isValid() or does this only happen when adding telnet interface in the mean time!?

22 QT4 (fixed): play button is now also pause button but has no pause icon yet
* done [[User:J-b|jb]] 12:43, 8 September 2007 (CEST)

23 QT4: cannot play files with underscores (this is in cygwin)

24 QT4: S button for taking snapshots doesn't work, nor does F for fullscreen
* F does work [[User:J-b|jb]] 15:56, 8 September 2007 (CEST)
* S Does worl too [[User:J-b|jb]] 16:12, 8 September 2007 (CEST)
* S is ok but F does not work in 21875 win32 [[User:Trax|Trax]] 18:30, 8 September 2007 (CEST)

25 QT4: rightclick in video doesn't open menu immediately, needs a "first" click this works counterintuitive, especially if you after that doubleclick for fullscreen (which needs another click then)

26 QT4: option to unhide menus works quite well, how do I unhide easily? suggestion, rightclick on video, tools, make a hide menu toggle (but this won't work if there is no vout active)

27 QT4 (fixed): in win32 it seems the main window isn't resized properly initially the bottom line icons (forward, stop etc.) are half their usual height, dragging the resize slider bottom right a bit makes it "normal" again after clip is played it "resets" to the wrong height again in initial mode
* fixed by ssbssa [[User:Funman|funman]] 03:38, 8 September 2007 (CEST)

28 QT4: file, open, this will give a default folder

C:\documents and settings\user\application data
note that there are no capitals while there should be (what is manipulating this?)
in WX the last used folder is remembered, in QT4 not

29 QT4: file open, when browsing there is always debug msgs:

intersectingStaticSet: row 10 was invalid

* QT4.2 bug under windows

30 QT4: when files are opened with weird characters in filename or path like

I:\ୌ\file_1.avi
it will be misidentified as having subtitles and spam: freetype warning: unbreakable string
does not happen in WX

31 QT4/WX: in cygwin gdb it's impossible to open files, gives weird filename could not open spam; drag and drop does work

32 QT4/WX: start audio stream, open visualisation goom, disable goom, will not destroy the goom vout

33 QT4/WX (fixed): goto time function doesn't reset timing counter. example clip is at 0:52/4:10 goto 0:10 with function and counter stays at 0:52/4:10 until the played clip exceeds 52 sec. then it continues to count
* Done. [[User:J-b|jb]] 12:58, 8 September 2007 (CEST)

34 QT4/WX: generic performance issue. a simple thing like opening internet explorer with blank page will interfere with VLC cause audio/video hickups when something is playing. regression
but --high-prio "fixes" it
* make high-prio default ? [[User:Funman|funman]] 01:47, 8 September 2007 (CEST)
* maybe workaround but there's something seriously wrong with performance that needs fixing. shouldn't have to use this option [[User:Trax|Trax]]

35 QT4/WX: play clip, turn on wallpaper, turn on deinterlace, wallpaper disappears from menu

== svn 21737 ==

CRASH 36 QT4: shoutcast TV discovery, click on the 1st discovered item, crash on playlist_nodedump

37 QT4: show more options in open dialogue. it's perhaps usable to always have this enabled?
makes it easier to copy/paste links in VLC and you can see what some options do if
you toggle them (timeshift etc.)

38 QT4/WX: opening a shoutcast playlist will not autostart the 1st item

CRASH 39 QT4: extended settings, add text, enable, disable (VLC marq still remains!), enable, crash

CRASH 40 QT4: extended settings, add logo, crash

41 QT4: file, open file. blank icons for files (no icons for registered filetypes)

42 QT4: [00000642] main interface error: option errors-dialog does not exist
* done in rev 21869. [[User:J-b|jb]] 16:54, 8 September 2007 (CEST)

43 QT4: menu inconsistencies. main menu has interfaces as part of tools while right click menu in vout has interfaces as seperate option

44 QT4: extended prefs doesn't have Close, OK or Cancel button. feels unnatural to close the prefs with the X top right. Use same Save, Cancel, Reset ext. prefs like the normal prefs menu has?

45 QT4: equalizer status isn't updated everywhere (already in trac?) when changing from main menu the status in extended prefs isn't updated accordingly and vice versa.the function is ok it's only the selection that isn't updated. why bother with 2 locations? doesn't extended prefs suffice or is main menu intended as "quick" setting?

== svn 21817 ==

46 QT4: cosmetics. extended prefs.. using wall or clone filter it's not possible to set the amount of clone or wall rows before hand because it's greyed out so you always have to use the defaults first, enable the option then set the appropriate amount.
* Yes. This is a normal behaviour, way easier to code. [[User:J-b|jb]] 13:48, 8 September 2007 (CEST)

47 QT4: start vlc, open playlist, dock playlist:
33201 1 QPaintDevice: Cannot destroy paint device that is being painted.
Be sure to QPainter::end() painters!

(fixed) 48 QT4: cosmetics. media information stats. imho the order looks nicer to have Video, Audio, Input, Streaming and also have the main window be just as big as all the expanded settings (same for Codec information)
* Done [[User:J-b|jb]] 13:08, 8 September 2007 (CEST)

49 QT4: open disc, disk device is not selectable (nothing to select, stays empty) and browse button is not functional yet. does work when I just manually type in my DVD drive as D:

50 QT4: cosmetics. language selection in interfaces is not sorted alphabetically
* No idea how to do that [[User:J-b|jb]] 14:29, 8 September 2007 (CEST)

51 QT4: cosmetics. Tools, Codec information and Media information, to have both seems a bit redundant (they both open the Codec information tab). Why not drop Codec information from the menu but keep the CTRL+I as Media information as I stands for information :)
* Because this is the most asked question in support: "What is the codec" [[User:J-b|jb]] 13:02, 8 September 2007 (CEST)

52 QT4: cosmetics: Tools, Codec information, Codec Details, why bother showing empty fields (i.e. Language is often not used)
* Because noones wants the same things. Won't fix [[User:J-b|jb]] 13:01, 8 September 2007 (CEST)

53 QT4: cosmetics. overall view of QT4 is quite huge compared to WX and even other players (this sample doesn't even have the extra buttons)
http://www.firstmiletv.nl/vlc/problems/qt4/windowsize.jpg
the play/stop etc. buttons in tray icon menu are already a lot smaller, are they usable?

54 QT4: cosmetics. the title section of the clip on the bottom does not have a 3d "feel" as if it's embedded, the same way the speed and time/duration section is.

55 QT4: cosmetics. personally I'd like the title section on the right and the time/speed on the left as it is with WX. this because those sections are rather fixed and "look" better at the left starting side.

56 QT4: cosmetics. as the slider bar is already quite large, why not have the time/duration section on the left or right side on the same height. this leaves more room for (often) long title info.

57 QT4: cosmetics and nice to have. magnetic menus for debug, ext. prefs etc. they open all over the place :)

58 QT4: always shows time slider, even for livestreams (i.e. shoutcast)