Skip to content

Commit

Permalink
Merge pull request #493 from mariux64/update-ffmpeg-babl-exiv2-gegl
Browse files Browse the repository at this point in the history
Update FFmpeg, BABL, Exiv2, and GEGL
  • Loading branch information
thomas authored Sep 26, 2017
2 parents 8fb70b9 + 2c6a9da commit b4442a3
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 50 deletions.
13 changes: 8 additions & 5 deletions babl-0.1.10-0.bee → babl.be0
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/usr/bin/env beesh

# BEE_VERSION babl-0.1.30-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)

###############################################################################
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="http://ftp.gtk.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.bz2"
SRCURL[0]="https://download.gimp.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.bz2"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand Down Expand Up @@ -43,12 +45,13 @@ SRCURL[0]="http://ftp.gtk.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.b
#}

#mee_configure() {
# bee_configure
# bee_configure
#}

#mee_build() {
# bee_build
#}
mee_build() {
bee_build
start_cmd make check
}

#mee_install() {
# bee_install
Expand Down
31 changes: 0 additions & 31 deletions exiv2-0.21.1-0.bee

This file was deleted.

87 changes: 87 additions & 0 deletions exiv2.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/usr/bin/env beesh

# BEE_VERSION exiv2-0.26-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)

###############################################################################
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="http://www.exiv2.org/builds/exiv2-${PKGVERSION}-trunk.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=()

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
## be added to you package but may be present in the image directory.

# EXCLUDE+=()

###############################################################################
## Uncomment the next statement, if the software may not be able to be built
## outside the source directory and needs to be built inside the source
## directory.

# build_in_sourcedir

###############################################################################
## bee cannot detect buildtypes specified in subdirectories.
## Sometimes packages "hide" the real sources in a subdirectory named
## 'src' or 'cmake' or ..
## use 'sourcesubdir_append' to specify this directory if known.

# sourcesubdir_append src


###############################################################################
## Change the default (auto-detected) steps to
## extract, patch, configure/setup, build and install the software.
## Make sure the mee_install function does install everything to the
## image directory "${D}"

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
--enable-video \
--enable-webready
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'

###############################################################################
##
## Additional hints:
##
## The name of this bee-file should follow the following naming convention:
## pkgname-pkgversion-pkgrevision.bee
##
## You may remove all comments as long as SRCURL[${PKGVERSION}] is set.
##
## Everything in this file will be executed in a bash environment.
##
## Build the package by executing
## './pkg-version-N.bee' or
## 'beesh ./pkg-version-N.bee'
##
## see http://beezinga.org/
##
5 changes: 2 additions & 3 deletions ffmpeg.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION ffmpeg-3.1.4-0
# BEE_VERSION ffmpeg-3.3.4-0

SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2"

Expand Down Expand Up @@ -45,8 +45,7 @@ mee_configure() {
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
--enable-x11grab
--enable-libx265
}

mee_build() {
Expand Down
12 changes: 5 additions & 7 deletions gegl.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION gegl-0.2.0-2
# BEE_VERSION gegl-0.3.20-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand All @@ -9,14 +9,13 @@
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="http://ftp.gtk.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.bz2"
SRCURL[0]="https://download.gimp.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.bz2"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/7.9/gegl-0.2.0-ffmpeg2-1.patch"
PATCHURL[1]="/src/mariux/beeroot/downloads/gegl-without-exiv2.patch"
# PATCHURL[0]=""

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
Expand Down Expand Up @@ -47,13 +46,12 @@ PATCHURL[1]="/src/mariux/beeroot/downloads/gegl-without-exiv2.patch"

mee_configure() {
bee_configure --disable-docs \
--without-vala \
--without-graphviz \
--without-lua
--without-vala
}

#mee_build() {
# bee_build
# start_cmd make check
#}

#mee_install() {
Expand Down
10 changes: 6 additions & 4 deletions gimp.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION gimp-2.8.22-0
# BEE_VERSION gimp-2.8.22-1

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand Down Expand Up @@ -49,9 +49,11 @@ SRCURL[0]="https://download.gimp.org/mirror/pub/gimp/v${PKGVERSION[2]}/gimp-${PK
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}
mee_patch() {
bee_patch "${@}"
start_cmd sed -i '/gegl/s/2/3/' configure
start_cmd sed -i '70,75 d' app/core/gimpparamspecs-duplicate.c
}

#mee_configure() {
# bee_configure
Expand Down

0 comments on commit b4442a3

Please sign in to comment.