Skip to content

Commit

Permalink
Cleanup the patches folder for 8.1
Browse files Browse the repository at this point in the history
The Raw patch may need to be applied during the whole 8.x development cycle as new preview providers are no longer accepted into core
  • Loading branch information
oparoz committed Jun 1, 2015
1 parent a14131b commit 63a136b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 703 deletions.
41 changes: 7 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Gallery
[![Build Status](https://travis-ci.org/owncloud/gallery.svg?branch=master)](https://travis-ci.org/owncloud/gallery)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/owncloud/gallery/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/owncloud/gallery/?branch=master)
[![Build Status](https://travis-ci.org/owncloud/gallery.svg?branch=dev)](https://travis-ci.org/owncloud/gallery)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/owncloud/gallery/badges/quality-score.png?b=dev)](https://scrutinizer-ci.com/g/owncloud/gallery/?branch=dev)

Media gallery for ownCloud which includes previews for all media types supported by your ownCloud installation.

Expand Down Expand Up @@ -54,8 +54,8 @@ May not look as nice, but should work
### Server requirements

#### Required
* ownCloud >= 8.0.2
* [See ownCloud's requirements](https://doc.owncloud.org/server/8.0/admin_manual/installation/source_installation.html#prerequisites)
* ownCloud >= 8.1
* [See ownCloud's requirements](https://doc.owncloud.org/server/8.1/admin_manual/installation/source_installation.html#prerequisites)

#### Recommended
* FreeBSD or Linux server
Expand Down Expand Up @@ -135,15 +135,6 @@ Next add a few new entries to your **config/config.php** configuration file.
),
```

If you want support for Raw picture files, you'll need to patch your installation of ownCloud 8.0

```
$ patch -p1 -l < apps/galleryplus/patches/tmpfile-extension.pull.13654.patch
$ patch -p1 -l < apps/galleryplus/patches/raw-preview.pull.13652.patch
```

and you'll need to add `OC\\Preview\\Raw` to the **config/config.php** configuration file

Look at the sample configuration (config.sample.php) in your config folder if you need more information about how the config file works.
That's it. You should be able to see more media types in your slideshows and galleries as soon as you've installed the app.

Expand All @@ -155,21 +146,6 @@ This can greatly reduce the loading time of the app.

Read about it in the [Administration Manual](https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/js_css_asset_management_configuration.html)

#### Generating thumbnails
Some of ownCloud's internal operations make the Gallery app very slow
* Generating thumbnails the first time you open the app
* Generating a full screen preview

Things are in motion to fix preview caching for ownCloud 8.1, but you can benefit from these improvements right now if you're willing to patch your ownCloud installation.

```
$ patch -p1 -l < apps/galleryplus/patches/max-preview.pull.13674.patch
$ patch -p1 -l < apps/galleryplus/patches/bitmap-max-preview.pull.13635.patch
```

It will always be relatively slow to get the first preview as this is when the conversion is taking place, but from the 2nd request, it should only take a few seconds, even for pictures weighing several hundred MBs.
The next step will be to be able to generate these previews by clicking on a button per example, so that things are ready when visiting the Gallery app.

## Installation

**IMPORTANT**: Make sure you've disabled the original Pictures app
Expand All @@ -185,18 +161,15 @@ The next step will be to be able to generate these previews by clicking on a but

In your terminal go into the **owncloud/apps/** directory and then run the following command:
```
$ git clone -b stable8 https://github.com/owncloud/galleryplus.git
$ git clone -b dev https://github.com/owncloud/galleryplus.git
```

Now you can activate it in the apps menu. It's called Gallery

To update the app go inside you **owncloud/apps/galleryplus/** directory and type:
```
$ git pull --rebase origin stable8
$ git pull --rebase origin dev
```

## List of patches
1. max-preview.pull.13674.patch : Limits previews to a max size of 2048x2048 by default
2. bitmap-max-preview.pull.13635.patch : Forces the bitmap converter to respect the max limits of previews
3. tmpfile-extension.pull.13654.patch : Makes sure temporary files have an extension so that ImageMagick can identify those files properly
4. raw-preview.pull.13652.patch : Allows ownCloud to visualise Raw files
None so far
132 changes: 0 additions & 132 deletions patches/bitmap-max-preview.pull.13635.patch

This file was deleted.

Loading

0 comments on commit 63a136b

Please sign in to comment.