summaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* revert an erroneous modification to the build systemjstebbins2009-05-261-1/+0
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2450 b64f7644-9d1e-0410-96f1-a4d463321fa5
* LinGui: expunge the remaining bits of xvid from the gtk guijstebbins2009-05-261-0/+1
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2449 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Excises xvid from libhb because it's not worthy. Having two different MPEG-4 ↵jbrjake2009-05-261-1/+0
| | | | | | | | | Part 2 encoders is superfluous and when choosing between ffmpeg and xvid, xvid is the clear loser since we need to keep ffmpeg around for other functions and xvid constantly requires attention to ensure it compiles. MacGui: Removes some stray references to the codec and unlinks it from the Xcode project. CLI: Removes references to the codec and removes it as a dependency. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2448 b64f7644-9d1e-0410-96f1-a4d463321fa5
* - bump to mp4v2-trunk-r349.konablend2009-05-231-1/+1
| | | | | | | | | - muxmp4.c minor updates to recent subtitle API changes. - muxmp4.c do not set zero-length tags. - renamed module libmp4v2 -> mp4v2. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2446 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: fixed regression introduced in r2425.konablend2009-05-191-1/+1
| | | | | | | | | - a 'space' snuck it's way into EXTRACT.tarbase default setting. - solution is to strip value of leading/trailing whitespace. - tested against a full-build. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2426 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: fixed EXTRACT.tarbase default to support .tar.bz2 and .tar.gz ↵konablend2009-05-191-1/+1
| | | | | | extensions. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2425 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: fix libmp4v2 error: Error: file number 2 already allocatedkonablend2009-05-025-21/+21
| | | | | | | | | - building libmp4v2 w/ --debug=max (-g3) exposes a gch issue. - workaround is to disable gch. - corrected variant/*.defs files: GCC.args.g.default -> GCC.args.g.std git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2367 b64f7644-9d1e-0410-96f1-a4d463321fa5
* add libdvdnav supportjstebbins2009-04-271-0/+1
| | | | | | | | | | | emulates the vm of a dvd player in order to navigate the disc more reliably it is optional and disabled by default CLI option '--dvdnav' enables. GUI's have a new option in preferences. When dvdnav is enabled, you can also select angles (cli '--angle') git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2355 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-04-201-1/+1
| | | | | | | - fixed project metadata for website URL; r2326 inadvertantly merged hbfork website git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2346 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: fix darwin/xcode to avoid double-configure/build after svn upkonablend2009-04-193-6/+15
| | | | | | | | | | | - build system automagically rebuilds certain files from libhb upwards after an svn up to maintain accurate repository information in binaries; if building with xcode the process was inadvertantly repeated on subsequent 'make'. - enhanced make/xcodemake to record the user's environment when shunted through xcode. this should help in diagnosing build issues from Xcode.app in the future. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2344 b64f7644-9d1e-0410-96f1-a4d463321fa5
* This patch adds mingw32 cross-compilation support to HandBrake trunk tokonablend2009-04-146-52/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produce native win32 binaries. The main benefits are the binary does not have any Cygwin runtime requirements and various host platforms can be leveraged to build HandBrake. Cross-compilation toolchains are complex to setup and recommended for experts only; but once setup it can build at speeds similar to native builds, on Darwin or Linux. BUILD INSTRUCTIONS: Add mingw32 toolchain to beginning of your path and take the toolchain prefix from gcc (eg: i386-mingw32-gcc) and pass to configure: ./configure --cross=i386-ming32 PRODUCTS: - hb.lib (static library) - HandBrakeCLI.exe DOWNLOADS: Contrib downloads need to be seeded with: - pthreads-w32-2-8-0-release.tar.gz (new) - xvidcore-20090311.tar.gz SUMMARY: Specifically, all GUI trees are not impacted. configure - added --cross=PREFIX - reworked search for gcc and cross-compile related tools to use prefix contrib/ - sub-patches added as needed for mingw contrib/xvidcore/ - bumped from 1.1.3 -> 1.2.1+ (daily 20090311) - reconstituted P01-cygwin.patch - created new P00-darwin.patch needed for macho64 asm flag on x86_64 arch libhb/ - uint -> uint32_t - remaining changes guarded by mingw32 macro. test/ - modified to support pthread-compatibility library attach/detach. - all changes guarded by mingw32 macro. BRANCHES: source: https://hbfork.googlecode.com/svn/branches/mingw@28 target: svn://svn.handbrake.fr/HandBrake/trunk@2325 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2326 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: minor change adding --force to launched buildskonablend2009-04-021-1/+1
| | | | | | | - helps with people who for some reason need to re-start the build without manually cleaning build/ dir. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2293 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: added HandBrakeCLI to universal-binary combination.konablend2009-03-261-0/+5
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2276 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Cygwin: removed faad2 patch no longer required as per faad2 bump.konablend2009-03-201-1/+1
| | | | | | | - added -N flag to contrib usage of patch to ignore patches which appear already applied. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2269 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: darwin + Xcode dependencies and enhancementskonablend2009-03-114-25/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset focuses on a disconnect between Xcode targets HandBrakeCLI and HandBrake.app when changest to external dependencies are made. The use case is to touch any .c file in libhb which then builds .o and re-creates libhb.a; next the Xcode targets should at least re-link. This did not happen because link-flags are used to add libhb.a and contrib libraries in Xcode; which effectively hides them from Xcode. The solution removes libhb.a from link-flags mechanism and places libhb.a as a framework library known to Xcode; and the expected re-linking occurs. contrib libraries will continue to use link-flags but since libhb.a has coarse-grained dependencies on contrib modules this will also cause Xcode targets to re-link. Further enhancements made to Xcode project: - Xcode now scans any .c files for .h file dependencies; will help with Xcode sources; the effect against libhb.a is moot; libhb.a will be rebuilt by external system anyways. - libbz2 and libz are now treated as framework libraries; it's more correct than listing all libraries as link-flags. - moved FRAMEWORK_SEARCH_PATHS to project-level for consistency in future targets. - moved LIBRARY_SEARCH_PATHS to project-level for conistency. - enabled GCC_WARN_TYPECHECK_CALLS_TO_PRINTF at project-level. [this changeset should not be a factor for other platforms; no side effects are expected] git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2257 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Cygwin: ffmpeg build tweakskonablend2009-03-101-8/+12
| | | | | | | | | | | | | | - bug: issues with universal input (including aac in mp4, wmv etc) - fix: add -fno-common to GCC - correctness: add --enable-memalign-hack as per ffmpeg docs - these issues were possibly a regression introduced with the new build system - a positive side effect to the build system is the availability of new makevar '<MODULE>.GCC.args.extra' which is a free-form way to add extra cflags to GCC functions. [this changeset does not effect any other platforms] git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2252 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: initial _skeleton_ asm support for libhb.konablend2009-03-102-20/+74
| | | | | | | | | - asm disposition is DISABLED. - it can only be enabled via a hidden configure option (--enable-asm) but will only be useful once asm code is checked-in. - this is checked-in early to not lose some internal configure enhancements made during asm build support impl. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2251 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: effects Darwin platforms onlykonablend2009-03-103-39/+57
| | | | | | | | | | | | | | | - fixed Darwin ppc hosted build reversion introduced in r2242. - fixed Darwin + Xcode in all scenerios to honor --debug option *** if building from Xcode there is no need to rebuild but you will have to close project and reload; xcodeproj has been updated. *** if building from terminal there *should* be no need to rebuild; the first 'make' after an update is expected to trigger a reconfigure and libhb will rebuild. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2248 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: fixed configure --debug + Xcodekonablend2009-03-092-9/+18
| | | | | | | | | | | | - only effects users building w/ Xcode from terminal or Xcode.app who need debug libhb. Bug details: - shunting through Xcode causes a re-configure to give GNUmakefile the 'Xcode' environment. - re-configure simply clobbered CONF.args thus losing effect of initial --debug option. - solution is to pass CONF.args to re-configure. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2244 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: new files required for r2242.konablend2009-03-083-0/+1592
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2243 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: general, configure and Xcode updates.konablend2009-03-088-686/+1102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *** NOTICE: This changeset requires a clean build directory. Please issue 'make xclean' inside build dir(s) after 'svn up'. This will help ensure there are no unexpected results. *** GENERAL: - renamed makevar PROJECT/ -> SRC/ for clarity. - renamed makevar PREFIX.install/ -> PREFIX/ for clarity. - split custom GNUmakefile overrides into defs/rules files. - inserted optional level of make customization at SRC/ level; see docs. - dropped HB.repo.wcversion (svnversion is no longer used). - corrected several 'rm' usages to use -f flag which avoids some build errors. - refreshed generated 00-Building.*.txt docs; work still in progress on the wiki front. *** CONFIGURE: - made configure more robust; configure may now be run outside of build directory! - adding log recording of configure activities. - improved readability of default options for configure - added: --force overwrite existing build config --src=DIR specify top-level source dir [.] --build=DIR specify build scratch/output dir [.] --prefix=DIR specify install dir for products [/Applications] - dropped --launch-force (replaced by --force) - dropped --launch-dir (replaced by --build) - dropped --launch-log *** XCODE: - renamed pbxproj definition EXTERNAL_PROJECT -> EXTERNAL_SRC for clarity. - fixed all configurations to default to EXTERNAL_JOBS=1 . - enabled Xcode internal parallelization (libhb, HandBrakeCLI and HandBrake benefit). - make now tickles Xcode build files to cause Info.plist regeneration and posting to HandBrake.app output; ie: svn up; click build and HandBrake.app's about panel will reflect the new repository rev. *** DARWIN: - added support to build universal binaries; see docs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2242 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-071-1/+6
| | | | | | | - added diagnostic target for troubleshooting build environment issues. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2237 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-051-1/+1
| | | | | | | | | | | | | | | | | | - changed behavior (which was introduced in r2223) of what MODULE target (phase) is dirtied when one of the contrib modules it depends upon is changed; eg: cleaned or build: old: MODULE.extract new: MODULE.configure - example of new (corrected) behavior: 1. svn update brings in a new change on faad2 module which has new version (url) 2. make 3. result: faad2 runs the guantlet: fetch->extract->patch->configure->build->install (FXPCBI for short) 4. result: ffmpeg has a dependency on faad2 and runs: CBI 5. result: libhb depends on all contrib modules and recompiles all .o and creates .a 6. result: [no xcode] HandBrakeCLI depends on libhb and recompiles all .o and relinks. 7. result: [xcode] HandBrakeCLI and HandBrake may need to be 'cleaned' to force them to recompile as opposed to just relinking. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2225 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-051-1/+3
| | | | | | | | - fixed race condition where bzip2,xvidcore may fail on missing contrib/{lib,include} dirs. - replaced literal command uses with var in bzip2,xvidcore . git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2224 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-053-36/+62
| | | | | | | | | | | | | | | | | | | - increased inter-contrib module rebuild sanity; ie: if an svn update is done and a new x264 tarball is available, the system will fetch it and proceed to extract->patch->configure->build->install and because it is utterly dangerous (undefined results can easily occur) to re-extract over an existing extract, the appropriate steps are taken to first rm -fr the tarball extraction directory. This is generally good practice but I'm explaining it here in detail in case some developers are taking risks like editing files in the build/ tree and erroneously assuming they will not be overwritten by either this new build system or contrib (foreign) build systems. - added contrib touch/untouch targets; see doc. - updated docs accordingly. - fixed typo for GCCargs.g.max which caused --debug=max to not operate properly. - unofficial builds will no longer rebrand naming to 'NoNameBrand' git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2223 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-042-1/+21
| | | | | | | | | | - added new target: make report.help (for cvk_b). - updated doc accordingly. - updated doc QuickStart chapter to be clearer for novices. - added wiki auto-posting targets which are work-in-progress git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2221 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: darwinkonablend2009-03-044-57/+82
| | | | | | | | | | | | | | | | | | | | - made Xcode external targets consistent for each configuration. - shunted terminal NAME=VALUE vars through xcodebuild. - folded macosx/module.xcode shunt functions into single. - added new report target to show a single var; eg: make report.var NAME=GCC.gcc . BuildSystem: darwin ppc - fixed configure on ppc host: correctly identify native architecture. - fixed configure to be more resilient when svn probes fail. - fixed configure to show error output for svn probes. BuildSystme: xcode - added external target 'external' to represent 'all things in external system' which is slight more than what 'libhb' might represent. - added doc section Building.osx: External Targets . git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2214 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-031-2/+3
| | | | | | | | | - added global uninstall target; the inverse of install - $PREFIX/bin/HandBrakeCLI longer paritipates in clean - added target test.uninstall to remove $PREFIX/bin/HandBrakeCLI git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2212 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-032-3/+8
| | | | | | | | - minor fix for report targets; aggregates were not included after splitting to rules file - fixed bug where non-darwin platforms caused all rules to be disabled because FEATURE.xcode was erroneously set to 1 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2207 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-036-34/+136
| | | | | | | | | | | | | - fixed OSX + Xcode to support parallel builds - enhanced OSX + Xcode to use proper pass-thru for all make targets - added global target --> install - added install: test.install - added install: gtk.install - updated pre-generated building guides (these will go away when wiki is updated) - updated xml2wiki script to spit out heading git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2205 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-023-34/+55
| | | | | | | | | | | | | | | | - changed HandBrakeCLI to use project.h when showing version in hblog - changed macosx/Info.h.m4 to supply correct version; eg: MacGUI about-panel - HandBrakeCLI hblog now displays architecture; eg: Darwin i386 - HandBrake.app about-panel now displays architecture; eg: i386 - updated all versioning to reflect project policies: a. HB_PROJECT_VERSION now behave as old HB_VERSION b. HB_PROJECT_BUILD now behaves as old HB_BUILD c. dropped HB_PROJECT_VERSION_FORMAL as it is no longer referenced - renamed HOST.proc -> HOST.machine for clarity - renamed BUILD.proc -> BUILD.machine for clarity git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2192 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-012-0/+16
| | | | | | | | | | | - added configure --prefix to specify an install location - propagated prefix to gtk's aggregated build - value is exposed to make as two variables, use either depending on if ending slash is desired $(INSTALL.prefix) $(INSTALL.prefix/) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2185 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem:konablend2009-03-011-1/+1
| | | | | | | | - trivial fix to allow make/include/PLATFORM.rules to be optional - this glitch resulted from adding darwin.rules for UB fat binary targets git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2182 b64f7644-9d1e-0410-96f1-a4d463321fa5
* BuildSystem: conversion from jam-based to make-based system.konablend2009-03-0117-0/+1553
KNOWN ISSUES: 1. OSX + Xcode builds do not support parallel builds; attempting to use them may cause unbounded number of jobs. However, disabling via configure --disable-xcode avoids the issue. 2. OSX ppc binary produces binary which has audio-scan problems. 3. OSX ppc64 binary has not been runtime tested. ADDED: 00-BuildUserGuide.txt contrib/*/module.* doc/ make/ libhb/module.* test/module.* macos/module.* gtk/module.* DROPPED: BUILD BuildContribDarwin.sh DownloadMacOsXContribBinaries.sh Jamfile Jamrules MacOsXContribBinariesVersion.txt Makefile Makefile.config jam libhb/Jamefile libhb/Makefile test/BUILDSHARED test/Makefile contrib/Jamfile contrib/Makefile contrib/patch-ffmpeg.patch contrib/patch-x264-idr.patch contrib/patch-x264-linux.patch RENAMED: contrib/*.patch -> contrib/MODULE/[AP]??-*.patch macosx/HandBrake.plist -> macosx/Info.plist MODIFIED: libhb/decavcodec.c Patched to use cleaner include "libavcodec/audioconvert". Second part to support this cleanup is ffmpeg A02-audioconvert.patch . MODIFIED: libhb/hb.c MODIFIED: libhb/hb.h MODIFIED: libhb/muxmkv.c MODIFIED: libhb/muxmp4.c MODIFIED: libhb/update.c Patched to use "project.h" for project metadata. Renamed HB_BUILD -> HB_PROJECT_BUILD. Renamed HB_VERSION -> HB_PROJECT_VERSION. MODIFIED: test/test.c: Patched HandBrakeCLI to support I/O on Mac OS X ZFS filesystems. Reference r1803 as similar patch for HandBrake.app . Unpatched behavior is crash/buserror when using ZFS. MODIFIED: macosx/Growl.framework/ Upgraded 0.7.6 (i386,ppc) -> 1.1.2 (i386,x86_64,ppc,ppc64). New architectures facilitate x86_64 and ppc64 builds. MODIFIED: macosx/HandBrake.xcodeproj/ Bumped compatibilty mode from 2.4 -> 3.1 . Dumped old configurations Deployment, Developer. Added configurations standard, sebug as replacements. Added standard.i386, standard.x86_64, standard.ppc, standard.ppc64 . for explicit architecture build. All configurations settings cleaned up and normalized. Build output directories adjusted to support new build system. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2180 b64f7644-9d1e-0410-96f1-a4d463321fa5