VideoLAN Wiki - User contributions [en]

MacOSCompile

2011-12-16T22:09:06Z

Riquedafreak: Undo revision 20885 by Riquedafreak (Talk)

This is an '''howto''' to compile {{VLC}} on ''Mac OS X'', focused on '''VLC 1.2''' and newer.

== Pre-requisites ==

=== Apple ===

*You need at least MacOSX 10.5.<br>'''10.6''', '''Snow Leopard''' is strongly recommended, though.
*'''Developer Tools from Apple''' from http://developer.apple.com/technology/xcode.html<br>''Xcode3'' and ''Xcode4'' should be fine.

Check that the LLVM GCC 4.2 compiler is installed:

$ gcc --version

=== GCC 4.2 on Xcode 4.2 ===

If you are on Xcode 4.2 with no previous Xcode installation, you '''NEED''' gcc-4.2 that isn't installed anymore.

Please install it from [https://github.com/kennethreitz/osx-gcc-installer/downloads OSX-GCC installer].

$ gcc-4.2 --version

=== Git ===

You need to get [http://git-scm.com/ Git] to clone VLC.

You can use [http://mxcl.github.com/homebrew/ homebrew] as:

$ brew install git

== [[GetTheSource|Get the source code]] ==

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

== Additional development tools ==

You need development tools, notably all the autotools, to build VLC correctly.

Here is how:
$ cd vlc/extras/tools
$ ./bootstrap
$ make
$ cd ../..

'''Important''': set the new PATH.
$ export PATH=$PWD/extras/tools/build/bin:$PATH

== SDK selection and 32/64 bits ==

=== SDK selection ===

If you want to use the 10.6 SDK (your VLC will only run on 10.6 and more recent computers):

$ export OSX_VERSION=10.6

You can do the same for '''10.5''', but please check that you have ''MacOSX10.5.sdk'' installed in ''/Developer/SDKs/'' . If you are using Xcode 4.2, you can [http://stackoverflow.com/a/6293605 install the 10.5 sdk] with the .dmg from Xcode3.

=== 32/64bits selection ===

The instructions below will build a 64 bits binary using 10.6 (Leopard) SDK. This is reflected by using host and build variables '''x86_64-apple-darwin10'''.

This "triplet" is ARCHITECTURE-apple-SYSTEM.

'''ARCHITECTURE'''

*<code>x86_64</code> represents Intel 64bits.
*<code>i686</code> represents Intel 32bits.
*<code>powerpc</code> represents PowerPC 32bits.

'''SDK SYSTEM'''

*<code>darwin9</code> represents MacOSX 10.5.
*<code>darwin10</code> represents MacOSX 10.6.

So to make a PowerPC build, you would use '''powerpc-apple-darwin9'''. So to make a intel32 build for 10.5+, you would use '''i686-apple-darwin9'''. So to make a intel64 build for 10.6+, you would use '''x86_64-apple-darwin10'''.

== Prepare [[Contrib Status|3rd party libraries]] ==

Before compiling VLC, you need lots of other libraries. Here is how to get them:

$ cd contrib
$ mkdir -p osx && cd osx
$ ../bootstrap --host=x86_64-apple-darwin10 --build=x86_64-apple-darwin10

=== Prebuilt libraries (recommended) ===

If you want to download a prebuilt package of all the needed libraries.

$ make prebuilt

=== Build your own libraries (not for the faint-hearted) ===

If you want to build from source a package in the contribs:

$ make -j4 .gettext
$ export PATH=$PWD/../x86_64-apple-darwin10/bin:$PATH

Then:

$ make -j4

If you had no errors, the 3rd party libraries (contrib) are built correctly and you can proceed to the next step.

=== Go Back ===

Go back to the VLC source directory:

$ cd ../..

== Bootstrap VLC ==

This will create the configure script:

$ ./bootstrap

== Configure the VLC build ==

Create a build folder:

$ mkdir -p build && cd build

To list the different options of configure:

$ ../extras/package/macosx/configure.sh --help

To build a 64 bits binary:

$ ../extras/package/macosx/configure.sh --enable-debug --host=x86_64-apple-darwin10 --build=x86_64-apple-darwin10

== Build VLC ==

Just do:
$ make -j4

and wait...

== Package VLC Application for Mac ==

If you want to share the application with another user or another computer:

$ make VLC-release.app

If you want a disk-image:

$ make package-macosx

Respectively <code>make package-macosx-plugin</code> for the Safari/Mozilla plugin.

== What's wrong: troubleshooting ==

=== Xcode path ===

Starting with Leopard, Xcode may be installed to a custom location on the administrator's choice. While this is non-problematic for ordinary Xcode projects, VLC needs a little help. You have to place extra symbolic links in /Developer pointing to your custom location for these folders:

<code>usr, Headers, Private, SDKs, Tools, Makefiles</code>

You can easily create these links by executing the following command for each folder (whereas theFolder is one of these six):

<code>ln -s /full/path/to/Developer/theFolder /Developer/theFolder</code>

=== Xcode version ===

Please make sure that you are using the latest Xcode3 or the latest version of Xcode4 to compile VLC

=== 3rd party packagers and PATH ===

'''Pay careful attention to remove any reference to 3rd party package managersfrom your environment.''' This is important to avoid conflicts between your package manager (homebrew, fink, macports...) and the contrib package manager we use to build our contrib.

It shouldn't be necessary, but it can happen.

'''git must still be accessible though!'''

$ unset PKG_CONFIG_PATH
$ unset PKG_CONFIG_LIBDIR
$ export PATH=$PWD/build/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin

=== QTsound compilation on X.5 ===

MacOS X.5.SDK is broken.

*Download the MacOS10.6.sdk and get QTCaptureDecompressedAudioOutput.h from ''/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/QTKit.framework/Headers/'' and move it to ''/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QTKit.framework/Headers/''

*Edit ''/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QTKit.framework/Headers/QTKit.h'' and add the

#import <QTKit/QTCaptureDecompressedAudioOutput.h> where needed.

=== Cross-Compilation to PPC from X.6 intel ===
If you want to compile VLC for PPC, based on a X.6 intel, you need to tweak a few things since Apple broke it.

'''This is VERY advanced stuff!'''

==== Pre-requisites ====
Be sure to:
* have X.6.8
* Xcode 4.2 installed in the normal ''/Developers'' location
* Xcode 3 installed in ''/Xcode3'' location
* MacOS X.6 and X.5 SDK installed in ''/Developers/SDKs/'' , as explained above (SDK selection).

==== GNU AS ====
Using this out of the box will not work because '''AS''' for ppc is broken on the default setup. Here is how to fix it:
cd /usr/libexec/as
sudo mkdir ppc
cd ppc
sudo ln -sf /Xcode3/usr/bin/as as

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

MacOSCompile

2011-12-16T20:52:26Z

Riquedafreak: GCC-10.6.pkg when compiling from Mac OS X 10.7

This is an '''howto''' to compile {{VLC}} on ''Mac OS X'', focused on '''VLC 1.2''' and newer.

== Pre-requisites ==

=== Apple ===

*You need at least MacOSX 10.5.<br>'''10.6''', '''Snow Leopard''' is strongly recommended, though.
*'''Developer Tools from Apple''' from http://developer.apple.com/technology/xcode.html<br>''Xcode3'' and ''Xcode4'' should be fine.

Check that the LLVM GCC 4.2 compiler is installed:

$ gcc --version

=== GCC 4.2 on Xcode 4.2 ===

If you are on Xcode 4.2 with no previous Xcode installation, you '''NEED''' gcc-4.2 that isn't installed anymore.

Please install it from [https://github.com/kennethreitz/osx-gcc-installer/downloads OSX-GCC installer]. '''''Note:''' Mac OS X 10.7: Lion users should download GCC-10.6.''

$ gcc-4.2 --version

=== Git ===

You need to get [http://git-scm.com/ Git] to clone VLC.

You can use [http://mxcl.github.com/homebrew/ homebrew] as:

$ brew install git

== [[GetTheSource|Get the source code]] ==

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

== Additional development tools ==

You need development tools, notably all the autotools, to build VLC correctly.

Here is how:
$ cd vlc/extras/tools
$ ./bootstrap
$ make
$ cd ../..

'''Important''': set the new PATH.
$ export PATH=$PWD/extras/tools/build/bin:$PATH

== SDK selection and 32/64 bits ==

=== SDK selection ===

If you want to use the 10.6 SDK (your VLC will only run on 10.6 and more recent computers):

$ export OSX_VERSION=10.6

You can do the same for '''10.5''', but please check that you have ''MacOSX10.5.sdk'' installed in ''/Developer/SDKs/'' . If you are using Xcode 4.2, you can [http://stackoverflow.com/a/6293605 install the 10.5 sdk] with the .dmg from Xcode3.

=== 32/64bits selection ===

The instructions below will build a 64 bits binary using 10.6 (Leopard) SDK. This is reflected by using host and build variables '''x86_64-apple-darwin10'''.

This "triplet" is ARCHITECTURE-apple-SYSTEM.

'''ARCHITECTURE'''

*<code>x86_64</code> represents Intel 64bits.
*<code>i686</code> represents Intel 32bits.
*<code>powerpc</code> represents PowerPC 32bits.

'''SDK SYSTEM'''

*<code>darwin9</code> represents MacOSX 10.5.
*<code>darwin10</code> represents MacOSX 10.6.

So to make a PowerPC build, you would use '''powerpc-apple-darwin9'''. So to make a intel32 build for 10.5+, you would use '''i686-apple-darwin9'''. So to make a intel64 build for 10.6+, you would use '''x86_64-apple-darwin10'''.

== Prepare [[Contrib Status|3rd party libraries]] ==

Before compiling VLC, you need lots of other libraries. Here is how to get them:

$ cd contrib
$ mkdir -p osx && cd osx
$ ../bootstrap --host=x86_64-apple-darwin10 --build=x86_64-apple-darwin10

=== Prebuilt libraries (recommended) ===

If you want to download a prebuilt package of all the needed libraries.

$ make prebuilt

=== Build your own libraries (not for the faint-hearted) ===

If you want to build from source a package in the contribs:

$ make -j4 .gettext
$ export PATH=$PWD/../x86_64-apple-darwin10/bin:$PATH

Then:

$ make -j4

If you had no errors, the 3rd party libraries (contrib) are built correctly and you can proceed to the next step.

=== Go Back ===

Go back to the VLC source directory:

$ cd ../..

== Bootstrap VLC ==

This will create the configure script:

$ ./bootstrap

== Configure the VLC build ==

Create a build folder:

$ mkdir -p build && cd build

To list the different options of configure:

$ ../extras/package/macosx/configure.sh --help

To build a 64 bits binary:

$ ../extras/package/macosx/configure.sh --enable-debug --host=x86_64-apple-darwin10 --build=x86_64-apple-darwin10

== Build VLC ==

Just do:
$ make -j4

and wait...

== Package VLC Application for Mac ==

If you want to share the application with another user or another computer:

$ make VLC-release.app

If you want a disk-image:

$ make package-macosx

Respectively <code>make package-macosx-plugin</code> for the Safari/Mozilla plugin.

== What's wrong: troubleshooting ==

=== Xcode path ===

Starting with Leopard, Xcode may be installed to a custom location on the administrator's choice. While this is non-problematic for ordinary Xcode projects, VLC needs a little help. You have to place extra symbolic links in /Developer pointing to your custom location for these folders:

<code>usr, Headers, Private, SDKs, Tools, Makefiles</code>

You can easily create these links by executing the following command for each folder (whereas theFolder is one of these six):

<code>ln -s /full/path/to/Developer/theFolder /Developer/theFolder</code>

=== Xcode version ===

Please make sure that you are using the latest Xcode3 or the latest version of Xcode4 to compile VLC

=== 3rd party packagers and PATH ===

'''Pay careful attention to remove any reference to 3rd party package managersfrom your environment.''' This is important to avoid conflicts between your package manager (homebrew, fink, macports...) and the contrib package manager we use to build our contrib.

It shouldn't be necessary, but it can happen.

'''git must still be accessible though!'''

$ unset PKG_CONFIG_PATH
$ unset PKG_CONFIG_LIBDIR
$ export PATH=$PWD/build/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin

=== QTsound compilation on X.5 ===

MacOS X.5.SDK is broken.

*Download the MacOS10.6.sdk and get QTCaptureDecompressedAudioOutput.h from ''/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/QTKit.framework/Headers/'' and move it to ''/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QTKit.framework/Headers/''

*Edit ''/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QTKit.framework/Headers/QTKit.h'' and add the

#import <QTKit/QTCaptureDecompressedAudioOutput.h> where needed.

=== Cross-Compilation to PPC from X.6 intel ===
If you want to compile VLC for PPC, based on a X.6 intel, you need to tweak a few things since Apple broke it.

'''This is VERY advanced stuff!'''

==== Pre-requisites ====
Be sure to:
* have X.6.8
* Xcode 4.2 installed in the normal ''/Developers'' location
* Xcode 3 installed in ''/Xcode3'' location
* MacOS X.6 and X.5 SDK installed in ''/Developers/SDKs/'' , as explained above (SDK selection).

==== GNU AS ====
Using this out of the box will not work because '''AS''' for ppc is broken on the default setup. Here is how to fix it:
cd /usr/libexec/as
sudo mkdir ppc
cd ppc
sudo ln -sf /Xcode3/usr/bin/as as

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

Git

2008-02-26T23:40:45Z

Riquedafreak: /* Staying up to date */

For your convenience, a git mirror of the VLC svn tree has been set up. Here is a tutorial on how to use the git VLC repository.

You can read more about the VLC svn tree on our [[Subversion| Subversion wiki page]].

= 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
$ 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 local git repository ==
Tell git your name. (use mostly by git-commit)
$ git repo-config user.name "Your Name"
$ git repo-config user.email "me@example.com"

== 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 fetch origin
$ git rebase origin
voilà! Your commit will be re-applied on top of the origin (the svn trunk).

== Submitting patches to the vlc-devel ==
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:
$ git format-patch -o out origin
which will produce the patches for each local commit in the directory "out".
You can also use the [http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html git-imap-send] command:
$ git format-patch --stdout --attach -n origin | git-imap-send
which will directly produces the emails and store them in a imap mail box, provided that you have properly set up [http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html git-imap-send].

= 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 ==
If the remote branch is named avacore_branch
$ git checkout origin/avacore_branch
To stay up-to-date a simple
$ git fetch
Should be enough.

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

==Undo commit ==
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:
$ git log
commit ff7004b70fd239e4120deb160e2991bd5237b8df
Author: fkuehne <fkuehne>
Date: Thu Apr 12 18:44:47 2007 +0000
* added sanity flags for future darwin releases and potentionally fixed OSX
commit a44a594898f981a145cfcace5f16f8973f9eb46f
Author: jb <jb>
Date: Thu Apr 12 16:24:49 2007 +0000
Qt4 - MouseWheel support - patch by Sergey Volk.

== 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
== Staying up to date ==
$ git pull

== Pushing your work ==
$ git push

= Using Git (and git-svn) to commit on VideoLAN SVN trunk =
== Initial checkout ==
First get the official VLC svn trunk within git
$ git-svn init svn://your_committer_login@svn.videolan.org/vlc
If you want the full history skip this step:
$ git-svn fetch -r19800
Now get the get the rest
$ git-svn fetch
Compress the tree:
$ git repack -d

== Keeping in sync ==
$ git-svn fetch
$ git rebase

== Commit to VLC svn through git-svn ==
Once you've locally committed your changes you should be able to commit them to the remote svn branch by doing:
$ git-svn dcommit

Note that with git-svn, you'll lost some of the git advantages, and it will probably introduce some overhead in some cases.

= Using Git to publish your work (for SoC student?) =
First get the official VLC '''Soc''' trunk
$ git clone git://git.videolan.org/vlc-soc.git
$ cd vlc-soc
Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch
$ git config remote.my_soc_public_branch.url ssh://your_name@altair.videolan.org/home/videolan/gitroot/vlc-soc.git
Now tell git that you want to automatically push the local master branch to the public your_name_branch:
$ git config remote.my_soc_public_branch.push +master:your_name_branch # the "+" will tell git to force update ignoring conflicts

Do some work and commit it to your master branch.
$ git commit -a
You can also sync with the trunk (origin) as needed
$ git fetch origin
$ git rebase origin
And don't forget to publish your changes:
$ git push my_soc_public_branch
Now you should be able to see your latest changes in your branch via [http://git.videolan.org/ gitweb].

= 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]

[[Category:Building]]

Git

2008-02-26T23:38:42Z

Riquedafreak: /* Staying up to date */

For your convenience, a git mirror of the VLC svn tree has been set up. Here is a tutorial on how to use the git VLC repository.

You can read more about the VLC svn tree on our [[Subversion| Subversion wiki page]].

= 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
$ 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 local git repository ==
Tell git your name. (use mostly by git-commit)
$ git repo-config user.name "Your Name"
$ git repo-config user.email "me@example.com"

== 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 fetch origin
$ git rebase origin
voilà! Your commit will be re-applied on top of the origin (the svn trunk).

== Submitting patches to the vlc-devel ==
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:
$ git format-patch -o out origin
which will produce the patches for each local commit in the directory "out".
You can also use the [http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html git-imap-send] command:
$ git format-patch --stdout --attach -n origin | git-imap-send
which will directly produces the emails and store them in a imap mail box, provided that you have properly set up [http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html git-imap-send].

= 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 ==
If the remote branch is named avacore_branch
$ git checkout origin/avacore_branch
To stay up-to-date a simple
$ git fetch
Should be enough.

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

==Undo commit ==
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:
$ git log
commit ff7004b70fd239e4120deb160e2991bd5237b8df
Author: fkuehne <fkuehne>
Date: Thu Apr 12 18:44:47 2007 +0000
* added sanity flags for future darwin releases and potentionally fixed OSX
commit a44a594898f981a145cfcace5f16f8973f9eb46f
Author: jb <jb>
Date: Thu Apr 12 16:24:49 2007 +0000
Qt4 - MouseWheel support - patch by Sergey Volk.

== 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
== Staying up to date ==
$ git pull --rebase
== Pushing your work ==
$ git push

= Using Git (and git-svn) to commit on VideoLAN SVN trunk =
== Initial checkout ==
First get the official VLC svn trunk within git
$ git-svn init svn://your_committer_login@svn.videolan.org/vlc
If you want the full history skip this step:
$ git-svn fetch -r19800
Now get the get the rest
$ git-svn fetch
Compress the tree:
$ git repack -d

== Keeping in sync ==
$ git-svn fetch
$ git rebase

== Commit to VLC svn through git-svn ==
Once you've locally committed your changes you should be able to commit them to the remote svn branch by doing:
$ git-svn dcommit

Note that with git-svn, you'll lost some of the git advantages, and it will probably introduce some overhead in some cases.

= Using Git to publish your work (for SoC student?) =
First get the official VLC '''Soc''' trunk
$ git clone git://git.videolan.org/vlc-soc.git
$ cd vlc-soc
Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch
$ git config remote.my_soc_public_branch.url ssh://your_name@altair.videolan.org/home/videolan/gitroot/vlc-soc.git
Now tell git that you want to automatically push the local master branch to the public your_name_branch:
$ git config remote.my_soc_public_branch.push +master:your_name_branch # the "+" will tell git to force update ignoring conflicts

Do some work and commit it to your master branch.
$ git commit -a
You can also sync with the trunk (origin) as needed
$ git fetch origin
$ git rebase origin
And don't forget to publish your changes:
$ git push my_soc_public_branch
Now you should be able to see your latest changes in your branch via [http://git.videolan.org/ gitweb].

= 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]

[[Category:Building]]

User:Riquedafreak

2008-01-02T22:31:52Z

Riquedafreak: Initial creation.

Faustino "Enrique" Osuna

New addition to the team, currently focusing efforts on Mac OS X Framework with [[User:Pdherbemont|Pierre d'Herbemont]].

VideoLAN Team

2008-01-02T22:28:51Z

Riquedafreak: Fixed typo, added myself (Faustino Osuna) to developer list.

This page is intended to help to know who's who.

You don't have to have a SVN write access to put your name here. If you hang out frequently on irc or on the forum write your name here.

(should probably be merged with http://www.videolan.org/team/index.html )

'' You can add yourself to the list following alphabetical order.''

{|
|+ VideoLAN Team
! align=left width=200 | Real name !! align=left width=100 | IRC Nick !!align=left width=100| SVN login !! align=left width=100 | wiki login !!align=left width=100 | Forum login !!
|-
| Filippo Carone || littlejohn || littlejohn || ? || ?
|-
| Rafaël Carré || funman || funman || [[User:Funman|Funman]] || funman
|-
| Antoine Cellerier || dionoea || dionoea || [[User:Dionoea|Dionoea]] || dionoea
|-
| Jerome Decoodt || DiDjCodt || djc || ? || ?
|-
| Rémi Denis-Courmont || courmish || courmish || [[User:Courmisch|Courmisch]] || Rémi Denis-Courmont
|-
| Pierre d'Herbemont || pdherbemont || pdherbemont || [[User:Pdherbemont|Pdherbemont]] || pdherbemont
|-
| Damien Fouilleul || Quovodis || damienf || [[User: Quovodis|Quovodis]] || ?
|-
| Samuel Hocevar || sam || sam || ? ||
|-
| Jean-Baptiste Kempf || j-b || jb || [[User:J-b|J-b]] || j-b
|-
| Pavlov Konstantin || thresh || thresh || [[User: Thresh|Thresh]] || thresh
|-
| Felix Paul Kühne || feepk || fkuehne || [[User:Fkuehne|Fkuehne]] || feepk
|-
| Christophe Massiot || Meuuh || meuuh || ? || ?
|-
| Christophe Mutricy || xtophe || xtophe || ? || ?
|-
| Ilkka Ollakka || ILEoo || ileoo || ? || ?
|-
| Faustino Osuna || riquedafreak || riquedafreak || [[User:Riquedafreak|Riquedafreak]] || riquedafreak
|-
| Yoann Peronneau || yoannp || yoann || [[User: Yoann|Yoann]] || yoann
|-
| Bernie Purcel || ? || bitmap || ? || ?
|-
| Jean-Paul Saman || jpsaman || jpsaman || [[User: jpsaman|jpsaman]] || jpsaman
|-
| Clément Stenac || zorglub || zorglub || ? || ?
|-
| Olivier Teulière || ipkiss || ipkiss || [[User:Ipkiss|Ipkiss]] || ipkiss
|}